add disabled buttons, instead of now showing buttons at all when they wont do anythin...

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 943e624e7dac94f23474fa0885e410c48732494c..4c36022cbe55ee32545b9deacd12ecfd4ad99538 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -58,13 +58,12 @@ gchar      *ob_sm_id;
 RrInstance *ob_rr_inst;
 RrTheme    *ob_rr_theme;
 Display    *ob_display;
-int         ob_screen;
-Window      ob_root;
-ObState     ob_state;
-gboolean    ob_sync;
+gint        ob_screen;
 Cursor      ob_cursors[OB_NUM_CURSORS];
 KeyCode     ob_keys[OB_NUM_KEYS];
 
+static ObState   state;
+static gboolean  xsync;
 static gboolean  shutdown;
 static gboolean  restart;
 static char     *restart_path;
@@ -92,7 +91,7 @@ int main(int argc, char **argv)
     xmlDocPtr doc;
     xmlNodePtr node;
 
-    ob_state = OB_STATE_STARTING;
+    state = OB_STATE_STARTING;
 
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
@@ -147,7 +146,6 @@ int main(int argc, char **argv)
 #endif
 
     ob_screen = DefaultScreen(ob_display);
-    ob_root = RootWindow(ob_display, ob_screen);
 
     ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
     if (ob_rr_inst == NULL)
@@ -155,7 +153,7 @@ int main(int argc, char **argv)
 
     /* XXX fork self onto other screens */
      
-    XSynchronize(ob_display, ob_sync);
+    XSynchronize(ob_display, xsync);
 
     /* check for locale support */
     if (!XSupportsLocale())
@@ -245,7 +243,6 @@ int main(int argc, char **argv)
         if (ob_rr_theme == NULL)
             exit_with_error("Unable to load a theme.");
 
-        frame_startup();
         moveresize_startup();
        screen_startup();
         group_startup();
@@ -258,10 +255,10 @@ int main(int argc, char **argv)
        /* get all the existing windows */
        client_manage_all();
 
-       ob_state = OB_STATE_RUNNING;
+       state = OB_STATE_RUNNING;
        while (!shutdown)
            event_loop();
-       ob_state = OB_STATE_EXITING;
+       state = OB_STATE_EXITING;
 
         dock_remove_all();
        client_unmanage_all();
@@ -273,7 +270,6 @@ int main(int argc, char **argv)
        screen_shutdown();
        focus_shutdown();
         moveresize_shutdown();
-        frame_shutdown();
         menu_shutdown();
         window_shutdown();
         grab_shutdown();
@@ -526,7 +522,7 @@ static void parse_args(int argc, char **argv)
             print_help();
             exit(0);
         } else if (!strcmp(argv[i], "--sync")) {
-            ob_sync = TRUE;
+            xsync = TRUE;
 #ifdef USE_SM
         } else if (!strcmp(argv[i], "--sm-client-id")) {
             if (i == argc - 1) /* no args left */
@@ -544,15 +540,6 @@ static void parse_args(int argc, char **argv)
     }
 }
 
-gboolean ob_pointer_pos(int *x, int *y)
-{
-    Window w;
-    int i;
-    guint u;
-
-    return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
-}
-
 #ifdef USE_SM
 static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
                              Bool shutdown, int interact_style, Bool fast)
@@ -613,3 +600,8 @@ KeyCode ob_keycode(ObKey key)
     g_assert(key < OB_NUM_KEYS);
     return ob_keys[key];
 }
+
+ObState ob_state()
+{
+    return state;
+}