perhaps fix problems of being left in menus without being able to control openbox

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 9c6065a745fb92b980f953558bc76a7a8b098241..e2784a2d3d578a46e235b07121fad6df33a3ebf3 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -50,11 +50,13 @@ gboolean grab_keyboard(gboolean grab)
     gboolean ret = FALSE;
 
     if (grab) {
-        if (kgrabs++ == 0)
+        if (kgrabs++ == 0) {
             ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
                                 FALSE, GrabModeAsync, GrabModeAsync,
                                 event_lasttime) == Success;
-        else
+            if (!ret)
+                --kgrabs;
+        } else
             ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
@@ -70,45 +72,18 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
     gboolean ret = FALSE;
 
     if (grab) {
-        if (pgrabs++ == 0)
+        if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
                                GrabModeAsync, FALSE,
                                ob_cursor(cur), event_lasttime) == Success;
-        else
+            if (!ret)
+                --pgrabs;
+        } else
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
-
-            /* ignore all enter events caused by ungrabbing the pointer */
-            {
-                GSList *saved = NULL, *it;
-                XEvent *e;
-                guint n = 0;
-                
-                XSync(ob_display, FALSE);
-
-                /* count the events */
-                while (TRUE) {
-                    e = g_new(XEvent, 1);
-                    if (XCheckTypedEvent(ob_display, EnterNotify, e)) {
-                        saved = g_slist_append(saved, e);
-                        ++n;
-                    } else {
-                        g_free(e);
-                        break;
-                    }
-                }
-                /* put the events back */
-                for (it = saved; it; it = g_slist_next(it)) {
-                    XPutBackEvent(ob_display, it->data);
-                    g_free(it->data);
-                }
-                g_slist_free(saved);
-                /* ignore the events */
-                event_ignore_enter_focus(n);
-            }
         }
         ret = TRUE;
     }
@@ -120,16 +95,19 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     gboolean ret = FALSE;
 
     if (grab) {
-        if (pgrabs++ == 0)
+        if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync, TRUE,
                                ob_cursor(cur),
                                event_lasttime) == Success;
-        else
+            if (!ret)
+                --pgrabs;
+        } else
             ret = TRUE;
     } else if (pgrabs > 0) {
-        if (--pgrabs == 0)
+        if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
+        }
         ret = TRUE;
     }
     return ret;