add 'grab_server' for grabbing .. the .. server!

diff --git a/openbox/client.c b/openbox/client.c
index c8d33e833faa911e3cc9c04f8cb8aed4ed7e96ee..790dba5a859cf7e69ad762d09f8bab7fd215cab1 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -5,6 +5,7 @@
 #include "frame.h"
 #include "engine.h"
 #include "event.h"
+#include "grab.h"
 #include "focus.h"
 #include "stacking.h"
 #include "dispatch.h"
@@ -120,9 +121,8 @@ void client_manage(Window window)
     XWindowAttributes attrib;
     XSetWindowAttributes attrib_set;
 /*    XWMHints *wmhint; */
-     
-    XGrabServer(ob_display);
-    XSync(ob_display, FALSE);
+
+    grab_server(TRUE);
 
     /* check if it has already been unmapped by the time we started mapping
        the grab does a sync so we don't have to here */
@@ -130,16 +130,14 @@ void client_manage(Window window)
        XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
        XPutBackEvent(ob_display, &e);
     
-       XUngrabServer(ob_display);
-       XFlush(ob_display);
+        grab_server(FALSE);
        return; /* don't manage it */
     }
 
     /* make sure it isn't an override-redirect window */
     if (!XGetWindowAttributes(ob_display, window, &attrib) ||
        attrib.override_redirect) {
-       XUngrabServer(ob_display);
-       XFlush(ob_display);
+        grab_server(FALSE);
        return; /* don't manage it */
     }
   
@@ -148,8 +146,7 @@ void client_manage(Window window)
        if ((wmhint->flags & StateHint) &&
            wmhint->initial_state == WithdrawnState) {
            /\* XXX: make dock apps work! *\/
-           XUngrabServer(ob_display);
-           XFlush(ob_display);
+            grab_server(FALSE);
            XFree(wmhint);
            return;
        }
@@ -184,8 +181,7 @@ void client_manage(Window window)
 
     client_apply_startup_state(client);
 
-    XUngrabServer(ob_display);
-    XFlush(ob_display);
+    grab_server(FALSE);
      
     client_list = g_slist_append(client_list, client);
     stacking_list = g_list_append(stacking_list, client);

diff --git a/openbox/grab.c b/openbox/grab.c
index 3bba14b3a434ca30edb3c6051cd456a571004e2e..c6beee746bba2d8f6b6972385e1010ff1a030731 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-static guint kgrabs, pgrabs;
+static guint kgrabs, pgrabs, sgrabs;
 
 void grab_keyboard(gboolean grab)
 {
@@ -28,13 +28,29 @@ void grab_pointer(gboolean grab, Cursor cur)
     }
 }
 
+void grab_server(gboolean grab)
+{
+    if (grab) {
+        if (sgrabs++ == 0) {
+            XGrabServer(ob_display);
+            XSync(ob_display, FALSE);
+        }
+    } else if (sgrabs > 0) {
+        if (--sgrabs == 0) {
+            XUngrabServer(ob_display);
+            XFlush(ob_display);
+        }
+    }
+}
+
 void grab_startup()
 {
-    kgrabs = pgrabs = 0;
+    kgrabs = pgrabs = sgrabs = 0;
 }
 
 void grab_shutdown()
 {
     while (kgrabs) grab_keyboard(FALSE);
     while (pgrabs) grab_pointer(FALSE, None);
+    while (sgrabs) grab_server(FALSE);
 }

diff --git a/openbox/grab.h b/openbox/grab.h
index 49c6a436ea3df57bd8c2b2a850414fa064ec2f28..d6a1b78aedc0887b5e8a84b4ef9e821e8ede031f 100644 (file)
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -9,5 +9,6 @@ void grab_shutdown();
 
 void grab_keyboard(gboolean grab);
 void grab_pointer(gboolean grab, Cursor cur);
+void grab_server(gboolean grab);
 
 #endif