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

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index cb41f7ee2d16454725d596cf96fc355f6e318d43..5f7585daa1ecc47c7147502774bd22eb1eb671d9 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -27,13 +27,15 @@ void dock_startup()
 
     attrib.event_mask = DOCK_EVENT_MASK;
     attrib.override_redirect = True;
-    dock->frame = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
+    dock->frame = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
+                                0, 0, 1, 1, 0,
                                 RrDepth(ob_rr_inst), InputOutput,
                                 RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
     dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
-    XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, dock->frame,
+                     RrColorPixel(ob_rr_theme->b_color));
     XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
@@ -91,7 +93,7 @@ void dock_add(Window win, XWMHints *wmhints)
       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)
        app->ignore_unmaps += 2;
 
     if (app->win != app->icon_win) {
@@ -133,7 +135,8 @@ void dock_remove(ObDockApp *app, gboolean reparent)
     g_hash_table_remove(window_map, &app->icon_win);
 
     if (reparent)
-       XReparentWindow(ob_display, app->icon_win, ob_root, app->x, app->y);
+       XReparentWindow(ob_display, app->icon_win,
+                        RootWindow(ob_display, ob_screen), app->x, app->y);
 
     dock->dock_apps = g_list_remove(dock->dock_apps, app);
     dock_configure();
@@ -517,7 +520,7 @@ void dock_hide(gboolean hide)
     } else {
         g_assert(!dock->hide_timer);
         dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
-                                       (TimeoutHandler)hide_timeout,
+                                       (ObTimeoutHandler)hide_timeout,
                                        NULL);
     }
 }