X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fopenbox.c;h=7e8fadc2eb4e7420d0cde5f9aa461e12cd307c40;hb=80a6f06c0a3d6de2c7d94066c5a9764b97a600af;hp=b688296516911f2afee8254577a00635c3d60d4c;hpb=4cb183401cc42f61a759b02f1210a3528f7869e5;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index b6882965..7e8fadc2 100644
--- 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
@@ -59,6 +60,10 @@
 #  include <sys/stat.h>
 #  include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/types.h>
+#  include <sys/wait.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
@@ -95,7 +100,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);
@@ -115,7 +120,7 @@ gint main(gint argc, gchar **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.");
 
@@ -128,6 +133,7 @@ gint main(gint argc, gchar **argv)
     ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
+    ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL);
 
     ob_screen = DefaultScreen(ob_display);
 
@@ -139,9 +145,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);
@@ -307,7 +313,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);
@@ -320,7 +326,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;
@@ -328,13 +335,20 @@ gint main(gint argc, gchar **argv)
 
 static void signal_handler(gint signal, gpointer data)
 {
-    if (signal == SIGUSR1) {
+    switch (signal) {
+    case SIGUSR1:
         ob_debug("Caught signal %d. Restarting.\n", signal);
         ob_restart();
-    } else if (signal == SIGUSR2) {
+        break;
+    case SIGUSR2:
         ob_debug("Caught signal %d. Reconfiguring.\n", signal);
-        ob_reconfigure();
-    } else {
+        ob_reconfigure(); 
+        break;
+    case SIGCHLD:
+        /* reap children */
+        while (waitpid(-1, NULL, WNOHANG) > 0);
+        break;
+    default:
         ob_debug("Caught signal %d. Exiting.\n", signal);
         /* TERM and INT return a 0 code */
         ob_exit(!(signal == SIGTERM || signal == SIGINT));
@@ -344,7 +358,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,7 +381,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);
 }