X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ea9b895f6d2d637f85d7ab93e82563690509b349;hb=5888e7ed4b7a6499f80ea4d4c6f10b16f99243a5;hp=3c2dfc284e5a7ccdebbf4fe27c664cccf5842c82;hpb=25ffe6b566379f25dd3cf7e74aeefd084b7e1b19;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3c2dfc28..ea9b895f 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -5,6 +5,7 @@
 #include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
+#include "startup.h"
 #include "screen.h"
 #include "focus.h"
 #include "moveresize.h"
@@ -30,10 +31,6 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-#ifdef HAVE_SYS_WAIT_H
-#  include <sys/types.h>
-#  include <sys/wait.h>
-#endif
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
@@ -94,10 +91,6 @@ int main(int argc, char **argv)
     sigaction(SIGTERM, &action, (struct sigaction *) NULL);
     sigaction(SIGINT, &action, (struct sigaction *) NULL);
     sigaction(SIGHUP, &action, (struct sigaction *) NULL);
-    sigaction(SIGCHLD, &action, (struct sigaction *) NULL);
-
-    /* anything that died while we were restarting won't give us a SIGCHLD */
-    while (waitpid(-1, NULL, WNOHANG) > 0);
 
     /* create the ~/.openbox dir */
     path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
@@ -151,10 +144,17 @@ int main(int argc, char **argv)
     ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
     ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner);
     ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner);
+    ob_cursors.t = XCreateFontCursor(ob_display, XC_top_side);
+    ob_cursors.r = XCreateFontCursor(ob_display, XC_right_side);
+    ob_cursors.b = XCreateFontCursor(ob_display, XC_bottom_side);
+    ob_cursors.l = XCreateFontCursor(ob_display, XC_left_side);
 
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
+    /* save stuff that we can use to restore state */
+    startup_save();
+
     if (screen_annex()) { /* it will be ours! */
         /* startup the parsing so everything can register sections of the rc */
         parse_startup();
@@ -260,10 +260,6 @@ void signal_handler(const ObEvent *e, void *data)
 	ob_shutdown = ob_restart = TRUE;
 	break;
 
-    case SIGCHLD:
-	wait(NULL);
-	break;
-
     case SIGHUP:
     case SIGINT:
     case SIGTERM:
@@ -328,7 +324,7 @@ void parse_args(int argc, char **argv)
 gboolean ob_pointer_pos(int *x, int *y)
 {
     Window w;
-    int i, x, y;
+    int i;
     guint u;
 
     return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);