yay no tabs in the source

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 5d640a90950e13e0ff111b5dea29e21133e1794c..aa296f9fa09a4cb0744694392b68a1be7f36038c 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -43,9 +43,9 @@
 
 /*! The event mask to grab on the root window */
 #define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \
-                       EnterWindowMask | LeaveWindowMask | \
-                       SubstructureNotifyMask | SubstructureRedirectMask | \
-                       ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+                        EnterWindowMask | LeaveWindowMask | \
+                        SubstructureNotifyMask | SubstructureRedirectMask | \
+                        ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
 
 guint    screen_num_desktops;
 guint    screen_num_monitors;
@@ -182,7 +182,7 @@ gboolean screen_annex()
                   ob_screen);
 
         XDestroyWindow(ob_display, screen_support_win);
-       return FALSE;
+        return FALSE;
     }
 
 
@@ -295,7 +295,7 @@ void screen_startup(gboolean reconfig)
         screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
     if (!reconfig) {
-        screen_set_desktop(0);
+        screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops) - 1);
 
         /* don't start in showing-desktop mode */
         screen_showing_desktop = FALSE;
@@ -355,7 +355,7 @@ void screen_resize()
                 net_desktop_geometry, cardinal, geometry, 2);
 
     if (ob_state() == OB_STATE_STARTING)
-       return;
+        return;
 
     screen_update_areas();
     dock_configure();
@@ -403,7 +403,7 @@ void screen_set_num_desktops(guint num)
 
     /* change our desktop if we're on one that no longer exists! */
     if (screen_desktop >= screen_num_desktops)
-       screen_set_desktop(num - 1);
+        screen_set_desktop(num - 1);
 
    /* update the focus lists */
     /* free our lists for the desktops which have disappeared */
@@ -605,7 +605,6 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
                            gboolean dialog, gboolean done, gboolean cancel)
 {
     static gboolean first = TRUE;
-    static gboolean lin;
     static guint origd, d;
     guint r, c;
 
@@ -617,13 +616,12 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     }
     if (first) {
         first = FALSE;
-        lin = linear;
         d = origd = screen_desktop;
     }
 
     get_row_col(d, &r, &c);
 
-    if (lin) {
+    if (linear) {
         switch (dir) {
         case OB_DIRECTION_EAST:
             if (d < screen_num_desktops - 1)
@@ -1161,9 +1159,9 @@ Rect *screen_area_monitor(guint desktop, guint head)
     if (head > screen_num_monitors)
         return NULL;
     if (desktop >= screen_num_desktops) {
-       if (desktop == DESKTOP_ALL)
-           return &area[screen_num_desktops][head];
-       return NULL;
+        if (desktop == DESKTOP_ALL)
+            return &area[screen_num_desktops][head];
+        return NULL;
     }
     return &area[desktop][head];
 }