reverse that last commit.. that was by accident..

3 files changed, 33 insertions, 44 deletions

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 91d968e9..7d2efd6e 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -112,14 +112,12 @@ gint main(gint argc, gchar **argv)
         g_warning("Unable to change to home directory (%s): %s",
                   g_get_home_dir(), g_strerror(errno));
      
-    /* parse out command line args */
-    parse_args(argc, argv);
+    parse_paths_startup();
 
-    if (!reconfigure_and_exit) {
-        parse_paths_startup();
+    session_startup(&argc, &argv);
 
-        session_startup(argc, argv);
-    }
+    /* parse out command line args */
+    parse_args(argc, argv);
 
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL)
@@ -127,26 +125,6 @@ gint main(gint argc, gchar **argv)
     if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
         ob_exit_with_error("Failed to set display as close-on-exec.");
 
-    if (reconfigure_and_exit) {
-        guint32 pid;
-        gboolean ret;
-
-        prop_startup(); /* get atoms values for the display */
-        ret = PROP_GET32(RootWindow(ob_display, DefaultScreen(ob_display)),
-                                    openbox_pid, cardinal, &pid);
-        XCloseDisplay(ob_display);
-        if (!ret) {
-            g_print("Openbox does not appear to be running on this "
-                    "display.\n");
-        } else {
-            g_print("Telling the Openbox process # %u to reconfigure.\n", pid);
-            ret = (kill(pid, SIGUSR2) == 0);
-            if (!ret)
-                g_print("Error: %s.\n", strerror(errno));
-        }
-        exit(ret ? EXIT_SUCCESS : EXIT_FAILURE);
-    }
-
     ob_main_loop = ob_main_loop_new(ob_display);
 
     /* set up signal handler */
@@ -392,9 +370,6 @@ static void print_help()
 {
     g_print("Syntax: openbox [options]\n\n");
     g_print("Options:\n\n");
-    g_print("  --reconfigure       Tell the currently running instance of "
-            "Openbox to\n"
-            "                      reconfigure (and then exit immediately)\n");
 #ifdef USE_SM
     g_print("  --sm-disable        Disable connection to session manager\n");
     g_print("  --sm-client-id ID   Specify session management ID\n");
@@ -431,8 +406,10 @@ static void parse_args(gint argc, gchar **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
-        } else if (!strcmp(argv[i], "--reconfigure")) {
-            reconfigure_and_exit = TRUE;
+        } else {
+            g_printerr("Invalid option: '%s'\n\n", argv[i]);
+            print_help();
+            exit(1);
         }
     }
 }
diff --git a/openbox/session.c b/openbox/session.c
index 23ad02f6..54ce34ed 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -105,32 +105,44 @@ static void save_commands()
     g_free(prop_cmd.vals);
 }
 
-static void parse_args(gint argc, gchar **argv)
+static void remove_args(gint *argc, gchar ***argv, gint index, gint num)
 {
     gint i;
 
-    for (i = 1; i < argc; ++i) {
-        if (!strcmp((argv)[i], "--sm-client-id")) {
-            if (i == argc - 1) /* no args left */
+    for (i = index; i < index + num; ++i)
+        (*argv)[i] = (*argv)[i+num];
+    *argc -= num;
+}
+
+static void parse_args(gint *argc, gchar ***argv)
+{
+    gint i;
+
+    for (i = 1; i < *argc; ++i) {
+        if (!strcmp((*argv)[i], "--sm-client-id")) {
+            if (i == *argc - 1) /* no args left */
                 g_printerr(_("--sm-client-id requires an argument\n"));
             else {
-                sm_id = g_strdup((argv)[i+1]);
+                sm_id = g_strdup((*argv)[i+1]);
+                remove_args(argc, argv, i, 2);
                 ++i;
             }
-        } else if (!strcmp((argv)[i], "--sm-save-file")) {
-            if (i == argc - 1) /* no args left */
+        } else if (!strcmp((*argv)[i], "--sm-save-file")) {
+            if (i == *argc - 1) /* no args left */
                 g_printerr(_("--sm-save-file requires an argument\n"));
             else {
-                save_file = g_strdup((argv)[i+1]);
+                save_file = g_strdup((*argv)[i+1]);
+                remove_args(argc, argv, i, 2);
                 ++i;
             }
-        } else if (!strcmp((argv)[i], "--sm-disable")) {
+        } else if (!strcmp((*argv)[i], "--sm-disable")) {
             sm_disable = TRUE;
+            remove_args(argc, argv, i, 1);
         }
     }
 }
 
-void session_startup(gint argc, gchar **argv)
+void session_startup(gint *argc, gchar ***argv)
 {
 #define SM_ERR_LEN 1024
 
@@ -162,8 +174,8 @@ void session_startup(gint argc, gchar **argv)
         g_free(filename);
     }
 
-    sm_argc = argc;
-    sm_argv = argv;
+    sm_argc = *argc;
+    sm_argv = *argv;
 
     cb.save_yourself.callback = sm_save_yourself;
     cb.save_yourself.client_data = NULL;
diff --git a/openbox/session.h b/openbox/session.h
index 680f45f0..c3146337 100644
--- a/openbox/session.h
+++ b/openbox/session.h
@@ -38,7 +38,7 @@ struct _ObSessionState {
 
 extern GList *session_saved_state;
 
-void session_startup(gint *argc, gchar ***argv);
+void session_startup(gint argc, gchar **argv);
 void session_shutdown();
 
 GList* session_state_find(struct _ObClient *c);