X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=017eb184115bdd3231634269fcdd34380811f8c5;hb=f76b26e4ad3b8a1e13478e855b1f8b286df7e83d;hp=c0ffa4203fa9a707e0f6dc410a356a045e415c63;hpb=9b33f7ded69e22ad18169c45b6b340dcb348e072;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index c0ffa420..017eb184 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -8,8 +8,10 @@
 #include "focus.h"
 #include "extensions.h"
 #include "gettext.h"
+#include "grab.h"
 #include "engine.h"
 #include "themerc.h"
+#include "plugin.h"
 #include "timer.h"
 #include "../render/render.h"
 #include "../render/font.h"
@@ -33,6 +35,9 @@
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
 #include <X11/cursorfont.h>
 
@@ -47,7 +52,7 @@ gboolean ob_remote   = FALSE;
 gboolean ob_sync     = TRUE;
 Cursors  ob_cursors;
 
-void signal_handler(int signal);
+void signal_handler(const ObEvent *e, void *data);
 
 int main(int argc, char **argv)
 {
@@ -63,9 +68,13 @@ int main(int argc, char **argv)
     bind_textdomain_codeset(PACKAGE, "UTF-8");
     textdomain(PACKAGE);
 
+    /* start our event dispatcher and register for signals */
+    dispatch_startup();
+    dispatch_register(Event_Signal, signal_handler, NULL);
+
     /* set up signal handler */
     sigemptyset(&sigset);
-    action.sa_handler = signal_handler;
+    action.sa_handler = dispatch_signal;
     action.sa_mask = sigset;
     action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
     sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
@@ -124,7 +133,6 @@ int main(int argc, char **argv)
      
     if (screen_annex()) { /* it will be ours! */
 	timer_startup();
-        dispatch_startup();
 	render_startup();
 	font_startup();
 	themerc_startup();
@@ -133,42 +141,71 @@ int main(int argc, char **argv)
 	screen_startup();
 	focus_startup();
 	client_startup();
-	  
-	/*HOOKFIRE(startup, "()");XXX*/
+        grab_startup();
+        plugin_startup();
+
+        /* XXX load all plugins!! */
+        plugin_open("focus");
+        plugin_open("keyboard");
+        plugin_open("mouse");
 
 	/* get all the existing windows */
 	client_manage_all();
 
 	ob_state = State_Running;
-	while (!ob_shutdown) {
+	while (!ob_shutdown)
 	    event_loop();
-	}
 	ob_state = State_Exiting;
 
 	client_unmanage_all();
 
-	/*HOOKFIRE(shutdown, "()");XXX*/
-
+        plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        grab_shutdown();
 	client_shutdown();
+	focus_shutdown();
 	screen_shutdown();
 	event_shutdown();
 	engine_shutdown();
 	themerc_shutdown();
 	render_shutdown();
-        dispatch_shutdown();
 	timer_shutdown();
     }
-	  
+
+    dispatch_shutdown();
+
     XCloseDisplay(ob_display);
 
-    /* XXX if (ob_restart) */
+    if (ob_restart) {
+        ob_restart_path = "";
+        if (ob_restart_path != NULL) {
+            int argcp;
+            char **argvp;
+            GError *err = NULL;
+
+            /* run other shit */
+            if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) {
+                execvp(argvp[0], argvp);
+                g_strfreev(argvp);
+            } else {
+                g_warning("failed to execute '%s': %s", ob_restart_path,
+                          err->message);
+            }
+        }
+
+        /* re-run me */
+        execvp(argv[0], argv); /* try how we were run */
+        execlp("ob3", "ob3", NULL); /* try this as a last resort */
+    }
      
     return 0;
 }
 
-void signal_handler(int signal)
+void signal_handler(const ObEvent *e, void *data)
 {
-    switch (signal) {
+    int s;
+
+    s = e->data.s.signal;
+    switch (s) {
     case SIGUSR1:
 	g_message("Caught SIGUSR1 signal. Restarting.");
 	ob_shutdown = ob_restart = TRUE;
@@ -182,12 +219,12 @@ void signal_handler(int signal)
     case SIGINT:
     case SIGTERM:
     case SIGPIPE:
-	g_message("Caught signal %d. Exiting.", signal);
+	g_message("Caught signal %d. Exiting.", s);
 	ob_shutdown = TRUE;
 	break;
 
     case SIGFPE:
     case SIGSEGV:
-	g_error("Caught signal %d. Aborting and dumping core.", signal);
+	g_error("Caught signal %d. Aborting and dumping core.", s);
     }
 }