X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=4556fc8fcc677d94e40fb2274a632ad774750920;hb=152c638ef10ba2aa062f46ff8b05eb7cbaad66ea;hp=e6ee886081d50c89f7e6ebf5ed533cd25f1ecde5;hpb=75b07a2bb3b98d581b39d3991cf1e9068452264a;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index e6ee8860..4556fc8f 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"
@@ -47,7 +49,7 @@ gboolean ob_remote   = FALSE;
 gboolean ob_sync     = TRUE;
 Cursors  ob_cursors;
 
-void signal_handler(const ObEvent *e);
+void signal_handler(const ObEvent *e, void *data);
 
 int main(int argc, char **argv)
 {
@@ -65,7 +67,7 @@ int main(int argc, char **argv)
 
     /* start our event dispatcher and register for signals */
     dispatch_startup();
-    dispatch_register(signal_handler, Event_Signal);
+    dispatch_register(Event_Signal, signal_handler, NULL);
 
     /* set up signal handler */
     sigemptyset(&sigset);
@@ -136,23 +138,28 @@ int main(int argc, char **argv)
 	screen_startup();
 	focus_startup();
 	client_startup();
+        grab_startup();
+        plugin_startup();
 
-        dispatch_ob(Event_Ob_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();
 
-        dispatch_ob(Event_Ob_Shutdown);
-
+        plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        grab_shutdown();
 	client_shutdown();
+	focus_shutdown();
 	screen_shutdown();
 	event_shutdown();
 	engine_shutdown();
@@ -160,19 +167,22 @@ int main(int argc, char **argv)
 	render_shutdown();
 	timer_shutdown();
     }
-	  
-    XCloseDisplay(ob_display);
 
     dispatch_shutdown();
 
+    XCloseDisplay(ob_display);
+
     /* XXX if (ob_restart) */
      
     return 0;
 }
 
-void signal_handler(const ObEvent *e)
+void signal_handler(const ObEvent *e, void *data)
 {
-    switch (e->data.signal) {
+    int s;
+
+    s = e->data.s.signal;
+    switch (s) {
     case SIGUSR1:
 	g_message("Caught SIGUSR1 signal. Restarting.");
 	ob_shutdown = ob_restart = TRUE;
@@ -186,12 +196,12 @@ void signal_handler(const ObEvent *e)
     case SIGINT:
     case SIGTERM:
     case SIGPIPE:
-	g_message("Caught signal %d. Exiting.", e->data.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.",e->data.signal);
+	g_error("Caught signal %d. Aborting and dumping core.", s);
     }
 }