X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fopenbox.c;h=93e91a59816d0a64f2980e992fa511df5d51e5b2;hb=f17b225daadb483b8736dc0e57a9def68e770ae9;hp=9dd50985daa0b138d4fcc027992ffc262e871b3c;hpb=43139ed3734c11c858f92f1c2cc7ed4cdba169cb;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 9dd50985..93e91a59 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,10 +1,12 @@
 #include "openbox.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
 #include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
+#include "startup.h"
 #include "screen.h"
 #include "focus.h"
 #include "moveresize.h"
@@ -30,10 +32,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 +92,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);
@@ -159,6 +153,9 @@ int main(int argc, char **argv)
     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();
@@ -170,7 +167,6 @@ int main(int argc, char **argv)
 	font_startup();
         theme_startup();
 	event_startup();
-        moveresize_startup();
         grab_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
@@ -188,13 +184,15 @@ int main(int argc, char **argv)
         g_free(theme);
         if (!theme) return 1;
 
+        window_startup();
         menu_startup();
         frame_startup();
-        stacking_startup();
+        moveresize_startup();
 	focus_startup();
 	screen_startup();
         group_startup();
 	client_startup();
+        dock_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -207,16 +205,19 @@ int main(int argc, char **argv)
 	    event_loop();
 	ob_state = State_Exiting;
 
+        dock_remove_all();
 	client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        dock_shutdown();
 	client_shutdown();
         group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
-        stacking_shutdown();
+        moveresize_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();
@@ -264,10 +265,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:
@@ -278,7 +275,8 @@ void signal_handler(const ObEvent *e, void *data)
 
     case SIGFPE:
     case SIGSEGV:
-	g_error("Caught signal %d. Aborting and dumping core.", s);
+	g_message("Caught signal %d. Aborting and dumping core.", s);
+        abort();
     }
 }