X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=18d9884d8f0dcc831a1dfab869cefc8e2bc6037e;hb=6194acb2710554a95090811eb6a4897fb7ee1a60;hp=dc1d357162ab885179cf51ef78ba05515970d4e3;hpb=b8309807ab8e18686db148fc46323237b9103787;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index dc1d3571..18d9884d 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -205,32 +205,27 @@ gint main(gint argc, gchar **argv)
     cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
                                                XC_top_left_corner);
 
-    /* create available keycodes */
-    keys[OB_KEY_RETURN] =
-        XKeysymToKeycode(ob_display, XK_Return);
-    keys[OB_KEY_ESCAPE] =
-        XKeysymToKeycode(ob_display, XK_Escape);
-    keys[OB_KEY_LEFT] =
-        XKeysymToKeycode(ob_display, XK_Left);
-    keys[OB_KEY_RIGHT] =
-        XKeysymToKeycode(ob_display, XK_Right);
-    keys[OB_KEY_UP] =
-        XKeysymToKeycode(ob_display, XK_Up);
-    keys[OB_KEY_DOWN] =
-        XKeysymToKeycode(ob_display, XK_Down);
 
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
     if (screen_annex(program_name)) { /* it will be ours! */
         do {
+            modkeys_startup(reconfigure);
+
+            /* get the keycodes for keys we use */
+            keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return);
+            keys[OB_KEY_ESCAPE] = modkeys_sym_to_code(XK_Escape);
+            keys[OB_KEY_LEFT] = modkeys_sym_to_code(XK_Left);
+            keys[OB_KEY_RIGHT] = modkeys_sym_to_code(XK_Right);
+            keys[OB_KEY_UP] = modkeys_sym_to_code(XK_Up);
+            keys[OB_KEY_DOWN] = modkeys_sym_to_code(XK_Down);
+
             {
                 ObParseInst *i;
                 xmlDocPtr doc;
                 xmlNodePtr node;
 
-                modkeys_startup(reconfigure);
-
                 /* startup the parsing so everything can register sections
                    of the rc */
                 i = parse_startup();
@@ -482,7 +477,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
 {
     gint i;
 
-    for (i = index; i < index + num; ++i)
+    for (i = index; i < *argc - num; ++i)
         argv[i] = argv[i+num];
     for (; i < *argc; ++i)
         argv[i] = NULL;
@@ -497,31 +492,41 @@ static void parse_args(gint *argc, gchar **argv)
         if (!strcmp(argv[i], "--version")) {
             print_version();
             exit(0);
-        } else if (!strcmp(argv[i], "--help")) {
+        }
+        else if (!strcmp(argv[i], "--help")) {
             print_help();
             exit(0);
-        } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+        }
+        else if (!strcmp(argv[i], "--g-fatal-warnings")) {
             g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-        } else if (!strcmp(argv[i], "--replace")) {
+        }
+        else if (!strcmp(argv[i], "--replace")) {
             ob_replace_wm = TRUE;
-        } else if (!strcmp(argv[i], "--sync")) {
+            remove_args(argc, argv, i, 1);
+            --i; /* this arg was removed so go back */
+        }
+        else if (!strcmp(argv[i], "--sync")) {
             xsync = TRUE;
-        } else if (!strcmp(argv[i], "--debug")) {
+        }
+        else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
             ob_debug_enable(OB_DEBUG_SM, TRUE);
             ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
-        } else if (!strcmp(argv[i], "--debug-focus")) {
+        }
+        else if (!strcmp(argv[i], "--debug-focus")) {
             ob_debug_show_output(TRUE);
             ob_debug_enable(OB_DEBUG_SM, TRUE);
             ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
             ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
-        } else if (!strcmp(argv[i], "--reconfigure")) {
+        }
+        else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
 /* don't make this do anything if it's not in --help ..
         } else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;
 */
-        } else if (!strcmp(argv[i], "--config")) {
+        }
+        else if (!strcmp(argv[i], "--config")) {
             if (i == *argc - 1) /* no args left */
                 g_printerr(_("--config requires an argument\n"));
             else {
@@ -538,8 +543,11 @@ static void parse_args(gint *argc, gchar **argv)
                 ob_sm_save_file = g_strdup(argv[i+1]);
                 remove_args(argc, argv, i, 2);
                 --i; /* this arg was removed so go back */
+                ob_debug_type(OB_DEBUG_SM, "--sm-save-file %s\n",
+                              ob_sm_save_file);
             }
-        } else if (!strcmp(argv[i], "--sm-client-id")) {
+        }
+        else if (!strcmp(argv[i], "--sm-client-id")) {
             if (i == *argc - 1) /* no args left */
                 /* not translated cuz it's sekret */
                 g_printerr("--sm-client-id requires an argument\n");
@@ -547,21 +555,14 @@ static void parse_args(gint *argc, gchar **argv)
                 ob_sm_id = g_strdup(argv[i+1]);
                 remove_args(argc, argv, i, 2);
                 --i; /* this arg was removed so go back */
+                ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s\n", ob_sm_id);
             }
-        } else if (!strcmp(argv[i], "--sm-disable")) {
+        }
+        else if (!strcmp(argv[i], "--sm-disable")) {
             ob_sm_use = FALSE;
         }
 #endif
-        else if (!strcmp(argv[i], "--restart-binary")) {
-            if (i == *argc - 1) /* no args left */
-                /* not translated cuz it's sekret */
-                g_printerr("--restart-binary requires an argument\n");
-            else {
-                argv[0] = g_strdup(argv[i+1]);
-                remove_args(argc, argv, i, 2);
-                --i; /* this arg was removed so go back */
-            }
-        } else {
+        else {
             /* this is a memleak.. oh well.. heh */
             gchar *err = g_strdup_printf
                 ("Invalid command line argument '%s'\n", argv[i]);