remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index d39e0cfce6d2f7f9fb79a3fbf5822d6a58d51c86..65669652f8dc4d3339438d616265c558f4f59b90 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -58,14 +58,12 @@ gchar      *ob_sm_id;
 RrInstance *ob_rr_inst;
 RrTheme    *ob_rr_theme;
 Display    *ob_display;
-int         ob_screen;
-Window      ob_root;
+gint        ob_screen;
 ObState     ob_state;
-gboolean    ob_sync;
 Cursor      ob_cursors[OB_NUM_CURSORS];
 KeyCode     ob_keys[OB_NUM_KEYS];
-char       *ob_rc_path;
 
+static gboolean  sync;
 static gboolean  shutdown;
 static gboolean  restart;
 static char     *restart_path;
@@ -148,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)
@@ -156,7 +153,7 @@ int main(int argc, char **argv)
 
     /* XXX fork self onto other screens */
      
-    XSynchronize(ob_display, ob_sync);
+    XSynchronize(ob_display, sync);
 
     /* check for locale support */
     if (!XSupportsLocale())
@@ -504,7 +501,6 @@ static void print_help()
     print_version();
     g_print("Syntax: openbox [options]\n\n");
     g_print("Options:\n\n");
-    g_print("  --rc PATH          Specify the path to the rc file to use\n");
 #ifdef USE_SM
     g_print("  --sm-client-id ID  Specify session management ID\n");
     g_print("  --sm-disable       Disable connection to session manager\n");
@@ -528,12 +524,7 @@ static void parse_args(int argc, char **argv)
             print_help();
             exit(0);
         } else if (!strcmp(argv[i], "--sync")) {
-            ob_sync = TRUE;
-        } else if (!strcmp(argv[i], "--rc")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("--rc requires an argument\n"));
-            else
-                ob_rc_path = argv[++i];
+            sync = TRUE;
 #ifdef USE_SM
         } else if (!strcmp(argv[i], "--sm-client-id")) {
             if (i == argc - 1) /* no args left */
@@ -557,7 +548,8 @@ gboolean ob_pointer_pos(int *x, int *y)
     int i;
     guint u;
 
-    return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
+    return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
+                           &w, &w, x, y, &i, &i, &u);
 }
 
 #ifdef USE_SM