add --reconfigure option to openbox.

this option will open the display, find the current openbox's PID from the root window, and send a SIGUSR2 to it, telling it to reconfigure. then it exits.

no longer printing help if you pass an invalid argument to openbox

since that is the case, session_startup doesnt need to be modifying the args anymore

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 7d2efd6e5b98510966397048398e3ab813d6b5c2..91d968e905b1255c68ed1bb09d2091e38d04d73e 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -112,19 +112,41 @@ gint main(gint argc, gchar **argv)
         g_warning("Unable to change to home directory (%s): %s",
                   g_get_home_dir(), g_strerror(errno));
      
-    parse_paths_startup();
-
-    session_startup(&argc, &argv);
-
     /* parse out command line args */
     parse_args(argc, argv);
 
+    if (!reconfigure_and_exit) {
+        parse_paths_startup();
+
+        session_startup(argc, argv);
+    }
+
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL)
         ob_exit_with_error("Failed to open the display.");
     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 */
@@ -370,6 +392,9 @@ 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");
@@ -406,10 +431,8 @@ static void parse_args(gint argc, gchar **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
-        } else {
-            g_printerr("Invalid option: '%s'\n\n", argv[i]);
-            print_help();
-            exit(1);
+        } else if (!strcmp(argv[i], "--reconfigure")) {
+            reconfigure_and_exit = TRUE;
         }
     }
 }

diff --git a/openbox/session.c b/openbox/session.c
index 54ce34ed4b64544c723f1bae50e0bf215a6b3f35..23ad02f66b087da8a4be15ad3a50c9510f4ba688 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -105,44 +105,32 @@ static void save_commands()
     g_free(prop_cmd.vals);
 }
 
-static void remove_args(gint *argc, gchar ***argv, gint index, gint num)
+static void parse_args(gint argc, gchar **argv)
 {
     gint i;
 
-    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 */
+    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]);
-                remove_args(argc, argv, i, 2);
+                sm_id = g_strdup((argv)[i+1]);
                 ++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]);
-                remove_args(argc, argv, i, 2);
+                save_file = g_strdup((argv)[i+1]);
                 ++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
 
@@ -174,8 +162,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;