only pass thru events when the menu is open, don't for other stuff

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index f63da5e94f3829b72b68a8f3c9f13c353538ec2a..dfff9570e3c6dab1aa8a9e4e2590f7236fca58a9 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -38,6 +38,22 @@ static guint pgrabs = 0;
 /*! The time at which the last grab was made */
 static Time  grab_time = CurrentTime;
 
+static Time ungrab_time()
+{
+    Time t = event_curtime;
+    if (!(t == CurrentTime || event_time_after(t, grab_time)))
+        /* When the time moves backward on the server, then we can't use
+           the grab time because that will be in the future. So instead we
+           have to use CurrentTime.
+
+           "XUngrabPointer does not release the pointer if the specified time
+           is earlier than the last-pointer-grab time or is later than the
+           current X server time."
+        */
+        t = CurrentTime; /*grab_time;*/
+    return t;
+}
+
 gboolean grab_on_keyboard()
 {
     return kgrabs > 0;
@@ -55,7 +71,7 @@ gboolean grab_keyboard(gboolean grab)
     if (grab) {
         if (kgrabs++ == 0) {
             ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
-                                FALSE, GrabModeAsync, GrabModeAsync,
+                                False, GrabModeAsync, GrabModeAsync,
                                 event_curtime) == Success;
             if (!ret)
                 --kgrabs;
@@ -65,10 +81,7 @@ gboolean grab_keyboard(gboolean grab)
             ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0) {
-            Time t = event_curtime;
-            if (t != 0 && t < grab_time)
-                t = grab_time;
-            XUngrabKeyboard(ob_display, t);
+            XUngrabKeyboard(ob_display, ungrab_time());
         }
         ret = TRUE;
     }
@@ -76,15 +89,15 @@ gboolean grab_keyboard(gboolean grab)
     return ret;
 }
 
-gboolean grab_pointer(gboolean grab, ObCursor cur)
+gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur)
 {
     gboolean ret = FALSE;
 
     if (grab) {
         if (pgrabs++ == 0) {
-            ret = XGrabPointer(ob_display, screen_support_win,
-                               False, GRAB_PTR_MASK, GrabModeAsync,
-                               GrabModeAsync, None,
+            ret = XGrabPointer(ob_display, screen_support_win, owner_events,
+                               GRAB_PTR_MASK,
+                               GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
@@ -94,23 +107,22 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            Time t = event_curtime;
-            if (t != 0 && t < grab_time)
-                t = grab_time;
-            XUngrabPointer(ob_display, event_curtime);
+            XUngrabPointer(ob_display, ungrab_time());
         }
         ret = TRUE;
     }
     return ret;
 }
 
-gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, gboolean owner_events,
+                             ObCursor cur, Window win)
 {
     gboolean ret = FALSE;
 
     if (grab) {
         if (pgrabs++ == 0) {
-            ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+            ret = XGrabPointer(ob_display, win, owner_events,
+                               GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
                                event_curtime) == Success;
@@ -122,10 +134,7 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            Time t = event_curtime;
-            if (t != 0 && t < grab_time)
-                t = grab_time;
-            XUngrabPointer(ob_display, event_curtime);
+            XUngrabPointer(ob_display, ungrab_time());
         }
         ret = TRUE;
     }
@@ -171,8 +180,8 @@ void grab_shutdown(gboolean reconfig)
     if (reconfig) return;
 
     while (grab_keyboard(FALSE));
-    while (grab_pointer(FALSE, OB_CURSOR_NONE));
-    while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
+    while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE));
+    while (grab_pointer_window(FALSE, FALSE, OB_CURSOR_NONE, None));
     while (grab_server(FALSE));
 }