add funcs to grab buttons and keys

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index c9d882790a96276aa24cf5e98133a128a2fe5418..4556fc8fcc677d94e40fb2274a632ad774750920 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -150,9 +150,8 @@ int main(int argc, char **argv)
        client_manage_all();
 
        ob_state = State_Running;
-       while (!ob_shutdown) {
+       while (!ob_shutdown)
            event_loop();
-       }
        ob_state = State_Exiting;
 
        client_unmanage_all();
@@ -160,6 +159,7 @@ int main(int argc, char **argv)
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
         grab_shutdown();
        client_shutdown();
+       focus_shutdown();
        screen_shutdown();
        event_shutdown();
        engine_shutdown();
@@ -168,12 +168,10 @@ int main(int argc, char **argv)
        timer_shutdown();
     }
 
-    /* reset focus to root before exiting */
-    XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
-    XCloseDisplay(ob_display);
-
     dispatch_shutdown();
 
+    XCloseDisplay(ob_display);
+
     /* XXX if (ob_restart) */
      
     return 0;