X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ef3f8ac533f450f427fa808932c9b7ff641b7591;hb=0e6161b0d4953b81273200fd31bd9c14fac4981b;hp=3ad198664b74021b6ae26d4b27f9c1309093b2e7;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3ad19866..ef3f8ac5 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    openbox.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -59,9 +59,14 @@
 #  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
+#include <errno.h>
 
 #include <X11/cursorfont.h>
 
@@ -76,15 +81,15 @@ static ObState   state;
 static gboolean  xsync;
 static gboolean  reconfigure;
 static gboolean  restart;
-static char     *restart_path;
+static gchar    *restart_path;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
 
-static void signal_handler(int signal, gpointer data);
-static void parse_args(int argc, char **argv);
+static void signal_handler(gint signal, gpointer data);
+static void parse_args(gint argc, gchar **argv);
 
-int main(int argc, char **argv)
+gint main(gint argc, gchar **argv)
 {
 #ifdef DEBUG
     ob_debug_show_output(TRUE);
@@ -100,6 +105,10 @@ int main(int argc, char **argv)
     textdomain(PACKAGE_NAME);
 
     g_set_prgname(argv[0]);
+
+    if (chdir(g_get_home_dir()) == -1)
+        g_warning("Unable to change to home directory (%s): %s",
+                  g_get_home_dir(), g_strerror(errno));
      
     parse_paths_startup();
 
@@ -123,6 +132,7 @@ int main(int argc, char **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);
 
@@ -130,8 +140,6 @@ int main(int argc, char **argv)
     if (ob_rr_inst == NULL)
         ob_exit_with_error("Failed to initialize the render library.");
 
-    /* XXX fork self onto other screens */
-     
     XSynchronize(ob_display, xsync);
 
     /* check for locale support */
@@ -205,7 +213,7 @@ int main(int argc, char **argv)
                 if (parse_load_rc(&doc, &node))
                     parse_tree(i, doc, node->xmlChildrenNode);
                 /* we're done with parsing now, kill it */
-                xmlFreeDoc(doc);
+                parse_close(doc);
                 parse_shutdown(i);
             }
 
@@ -248,6 +256,7 @@ int main(int argc, char **argv)
             if (!reconfigure) {
                 /* get all the existing windows */
                 client_manage_all();
+                focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
             } else {
                 GList *it;
 
@@ -286,6 +295,8 @@ int main(int argc, char **argv)
         } while (reconfigure);
     }
 
+    XSync(ob_display, FALSE);
+
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
@@ -297,8 +308,8 @@ int main(int argc, char **argv)
 
     if (restart) {
         if (restart_path != NULL) {
-            int argcp;
-            char **argvp;
+            gint argcp;
+            gchar **argvp;
             GError *err = NULL;
 
             /* run other shit */
@@ -308,6 +319,7 @@ int main(int argc, char **argv)
             } else {
                 g_warning("failed to execute '%s': %s", restart_path,
                           err->message);
+                g_error_free(err);
             }
         }
 
@@ -319,16 +331,23 @@ int main(int argc, char **argv)
     return exitcode;
 }
 
-static void signal_handler(int signal, gpointer data)
+static void signal_handler(gint signal, gpointer data)
 {
-    if (signal == SIGUSR1) {
-	fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
+    switch (signal) {
+    case SIGUSR1:
+        ob_debug("Caught signal %d. Restarting.\n", signal);
         ob_restart();
-    } else if (signal == SIGUSR2) {
-	fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
-        ob_reconfigure();
-    } else {
-	fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
+        break;
+    case SIGUSR2:
+        ob_debug("Caught signal %d. Reconfiguring.\n", signal);
+        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));
     }
@@ -364,9 +383,9 @@ static void print_help()
     g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
 
-static void parse_args(int argc, char **argv)
+static void parse_args(gint argc, gchar **argv)
 {
-    int i;
+    gint i;
 
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--version")) {