make sure the ungrab happens after the grab. fracking X server doesn't have a monatom...

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index b4c192b0bfdde8151271fdf9b50d136fe8aa3661..f63da5e94f3829b72b68a8f3c9f13c353538ec2a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -35,6 +35,8 @@
 static guint mask_list[MASK_LIST_SIZE];
 static guint kgrabs = 0;
 static guint pgrabs = 0;
+/*! The time at which the last grab was made */
+static Time  grab_time = CurrentTime;
 
 gboolean grab_on_keyboard()
 {
@@ -54,14 +56,20 @@ gboolean grab_keyboard(gboolean grab)
         if (kgrabs++ == 0) {
             ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
                                 FALSE, GrabModeAsync, GrabModeAsync,
-                                event_lasttime) == Success;
+                                event_curtime) == Success;
             if (!ret)
                 --kgrabs;
+            else
+                grab_time = event_curtime;
         } else
             ret = TRUE;
     } else if (kgrabs > 0) {
-        if (--kgrabs == 0)
-            XUngrabKeyboard(ob_display, event_lasttime);
+        if (--kgrabs == 0) {
+            Time t = event_curtime;
+            if (t != 0 && t < grab_time)
+                t = grab_time;
+            XUngrabKeyboard(ob_display, t);
+        }
         ret = TRUE;
     }
 
@@ -77,14 +85,19 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
                                GrabModeAsync, None,
-                               ob_cursor(cur), event_lasttime) == Success;
+                               ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
+            else
+                grab_time = event_curtime;
         } else
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, event_lasttime);
+            Time t = event_curtime;
+            if (t != 0 && t < grab_time)
+                t = grab_time;
+            XUngrabPointer(ob_display, event_curtime);
         }
         ret = TRUE;
     }
@@ -100,14 +113,19 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
-                               event_lasttime) == Success;
+                               event_curtime) == Success;
             if (!ret)
                 --pgrabs;
+            else
+                grab_time = event_curtime;
         } else
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, event_lasttime);
+            Time t = event_curtime;
+            if (t != 0 && t < grab_time)
+                t = grab_time;
+            XUngrabPointer(ob_display, event_curtime);
         }
         ret = TRUE;
     }