add --reconfigure option to openbox.

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index ef3f8ac533f450f427fa808932c9b7ff641b7591..91d968e905b1255c68ed1bb09d2091e38d04d73e 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    openbox.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -75,16 +76,17 @@ RrTheme    *ob_rr_theme;
 ObMainLoop *ob_main_loop;
 Display    *ob_display;
 gint        ob_screen;
-gboolean    ob_replace_wm;
+gboolean    ob_replace_wm = FALSE;
 
 static ObState   state;
-static gboolean  xsync;
-static gboolean  reconfigure;
-static gboolean  restart;
-static gchar    *restart_path;
+static gboolean  xsync = FALSE;
+static gboolean  reconfigure = FALSE;
+static gboolean  restart = FALSE;
+static gchar    *restart_path = NULL;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
+static gboolean  reconfigure_and_exit = FALSE;
 
 static void signal_handler(gint signal, gpointer data);
 static void parse_args(gint argc, gchar **argv);
@@ -99,7 +101,7 @@ gint main(gint argc, gchar **argv)
 
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
-       g_warning("Couldn't set locale from environment.\n");
+        g_warning("Couldn't set locale from environment.\n");
     bindtextdomain(PACKAGE_NAME, LOCALEDIR);
     bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
     textdomain(PACKAGE_NAME);
@@ -110,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.");
+        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 */
@@ -144,9 +168,9 @@ gint main(gint argc, gchar **argv)
 
     /* check for locale support */
     if (!XSupportsLocale())
-       g_warning("X server does not support locale.");
+        g_warning("X server does not support locale.");
     if (!XSetLocaleModifiers(""))
-       g_warning("Cannot set locale modifiers for the X server.");
+        g_warning("Cannot set locale modifiers for the X server.");
 
     /* set our error handler */
     XSetErrorHandler(xerror_handler);
@@ -312,7 +336,7 @@ gint main(gint argc, gchar **argv)
             gchar **argvp;
             GError *err = NULL;
 
-            /* run other shit */
+            /* run other window manager */
             if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) {
                 execvp(argvp[0], argvp);
                 g_strfreev(argvp);
@@ -325,7 +349,8 @@ gint main(gint argc, gchar **argv)
 
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
-        execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
+        execlp(argv[0], g_path_get_basename(argv[0]),
+               (char *)NULL); /* last resort */
     }
      
     return exitcode;
@@ -356,7 +381,8 @@ static void signal_handler(gint signal, gpointer data)
 static void print_version()
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
-       g_print("Copyright (c) 2003 Ben Jansens, and others\n\n");
+    g_print("Copyright (c) 2006 Mikael Magnusson\n");
+    g_print("Copyright (c) 2003 Ben Jansens\n\n");
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");
@@ -366,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");
@@ -378,7 +407,7 @@ static void print_help()
     g_print("  --version           Display the version and exit\n");
     g_print("  --sync              Run in synchronous mode (this is slow and "
             "meant for\n"
-                       "                      debugging X routines)\n");
+            "                      debugging X routines)\n");
     g_print("  --debug             Display debugging output\n");
     g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
@@ -402,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;
         }
     }
 }