make ob_state a function so it cant be changed outside of openbox.c

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 141bfcb949f52864740f89c2c122a50c5d4ed12a..339c2a18515d9860a197da9d910d279fd5344c56 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -67,7 +67,8 @@ void client_set_list()
     } else
        windows = NULL;
 
-    PROP_SETA32(ob_root, net_client_list, window, (guint32*)windows, size);
+    PROP_SETA32(RootWindow(ob_display, ob_screen),
+                net_client_list, window, (guint32*)windows, size);
 
     if (windows)
        g_free(windows);
@@ -113,7 +114,8 @@ void client_manage_all()
     XWMHints *wmhints;
     XWindowAttributes attrib;
 
-    XQueryTree(ob_display, ob_root, &w, &w, &children, &nchild);
+    XQueryTree(ob_display, RootWindow(ob_display, ob_screen),
+               &w, &w, &children, &nchild);
 
     /* remove all icon windows from the list */
     for (i = 0; i < nchild; i++) {
@@ -254,7 +256,7 @@ void client_manage(Window window)
     focus_order_add_new(self);
 
     /* focus the new window? */
-    if (ob_state != OB_STATE_STARTING && config_focus_new &&
+    if (ob_state() != OB_STATE_STARTING && config_focus_new &&
         (self->type == OB_CLIENT_TYPE_NORMAL || self->type == OB_CLIENT_TYPE_DIALOG)) {
         gboolean group_foc = FALSE;
         
@@ -403,7 +405,7 @@ void client_unmanage(ObClient *self)
     frame_release_client(self->frame, self);
     self->frame = NULL;
      
-    if (ob_state != OB_STATE_EXITING) {
+    if (ob_state() != OB_STATE_EXITING) {
        /* these values should not be persisted across a window
           unmapping/mapping */
        prop_erase(self->window, prop_atoms.net_wm_desktop);
@@ -700,7 +702,7 @@ void client_update_transient_for(ObClient *self)
                    group */
                 if (t == self->group->leader ||
                     t == None ||
-                    t == ob_root) {
+                    t == RootWindow(ob_display, ob_screen)) {
                     /* window is a transient for its group! */
                     c = OB_TRAN_GROUP;
                 }
@@ -1123,7 +1125,7 @@ void client_update_wmhints(ObClient *self)
 
        /* only do this when first managing the window *AND* when we aren't
            starting up! */
-       if (ob_state != OB_STATE_STARTING && self->frame == NULL)
+       if (ob_state() != OB_STATE_STARTING && self->frame == NULL)
             if (hints->flags & StateHint)
                 self->iconic = hints->initial_state == IconicState;
 
@@ -1485,27 +1487,28 @@ ObClient *client_search_focus_tree_full(ObClient *self)
     return client_search_focus_tree(self);
 }
 
-static StackLayer calc_layer(ObClient *self)
+static ObStackingLayer calc_layer(ObClient *self)
 {
-    StackLayer l;
+    ObStackingLayer l;
 
-    if (self->fullscreen) l = Layer_Fullscreen;
-    else if (self->type == OB_CLIENT_TYPE_DESKTOP) l = Layer_Desktop;
+    if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+    else if (self->type == OB_CLIENT_TYPE_DESKTOP)
+        l = OB_STACKING_LAYER_DESKTOP;
     else if (self->type == OB_CLIENT_TYPE_DOCK) {
-        if (!self->below) l = Layer_Top;
-        else l = Layer_Normal;
+        if (!self->below) l = OB_STACKING_LAYER_TOP;
+        else l = OB_STACKING_LAYER_NORMAL;
     }
-    else if (self->above) l = Layer_Above;
-    else if (self->below) l = Layer_Below;
-    else l = Layer_Normal;
+    else if (self->above) l = OB_STACKING_LAYER_ABOVE;
+    else if (self->below) l = OB_STACKING_LAYER_BELOW;
+    else l = OB_STACKING_LAYER_NORMAL;
 
     return l;
 }
 
 static void client_calc_layer_recursive(ObClient *self, ObClient *orig,
-                                        StackLayer l, gboolean raised)
+                                        ObStackingLayer l, gboolean raised)
 {
-    StackLayer old, own;
+    ObStackingLayer old, own;
     GSList *it;
 
     old = self->layer;
@@ -1526,7 +1529,7 @@ static void client_calc_layer_recursive(ObClient *self, ObClient *orig,
 
 void client_calc_layer(ObClient *self)
 {
-    StackLayer l;
+    ObStackingLayer l;
     ObClient *orig;
 
     orig = self;