export the NumLock and ScrollLock masks

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index bf8913bc1bcab5c70424f6299ea8c46007df4370..4556fc8fcc677d94e40fb2274a632ad774750920 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -8,6 +8,7 @@
 #include "focus.h"
 #include "extensions.h"
 #include "gettext.h"
+#include "grab.h"
 #include "engine.h"
 #include "themerc.h"
 #include "plugin.h"
@@ -137,25 +138,28 @@ int main(int argc, char **argv)
        screen_startup();
        focus_startup();
        client_startup();
+        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();
 
-        plugin_shutdown();
+        plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        grab_shutdown();
        client_shutdown();
+       focus_shutdown();
        screen_shutdown();
        event_shutdown();
        engine_shutdown();
@@ -163,11 +167,11 @@ int main(int argc, char **argv)
        render_shutdown();
        timer_shutdown();
     }
-         
-    XCloseDisplay(ob_display);
 
     dispatch_shutdown();
 
+    XCloseDisplay(ob_display);
+
     /* XXX if (ob_restart) */
      
     return 0;