prefix and capitalize ObMenu ObMenuEntry and ObMenuEntryRenderType

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index decebbce85581d2819b8f1416c79dbbc0b722ac7..5efc869a5909100101dca56e1374d3ef5bd8737b 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -48,7 +48,8 @@ ObFrame *frame_new()
     mask = CWOverrideRedirect | CWEventMask;
     attrib.event_mask = FRAME_EVENTMASK;
     attrib.override_redirect = TRUE;
-    self->window = createWindow(ob_root, mask, &attrib);
+    self->window = createWindow(RootWindow(ob_display, ob_screen),
+                                mask, &attrib);
 
     mask = 0;
     self->plate = createWindow(self->window, mask, &attrib);
@@ -348,7 +349,7 @@ void frame_grab_client(ObFrame *self, ObClient *client)
       member set the root window, and one set to the client, but both get
       handled and need to be ignored.
     */
-    if (ob_state == OB_STATE_STARTING)
+    if (ob_state() == OB_STATE_STARTING)
        client->ignore_unmaps += 2;
 
     /* select the event mask on the client's parent (to receive config/map
@@ -395,7 +396,8 @@ void frame_release_client(ObFrame *self, ObClient *client)
     } else {
        /* according to the ICCCM - if the client doesn't reparent itself,
           then we will reparent the window to root for them */
-       XReparentWindow(ob_display, client->window, ob_root,
+       XReparentWindow(ob_display, client->window,
+                        RootWindow(ob_display, ob_screen),
                        client->area.x,
                        client->area.y);
     }
@@ -582,7 +584,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
 {
     ObFrame *self;
 
-    if (win == ob_root) return OB_FRAME_CONTEXT_ROOT;
+    if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
     if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;