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 34fd2302811db7d8b3c0313dffe696622590890a..f63da5e94f3829b72b68a8f3c9f13c353538ec2a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -31,9 +32,11 @@
 #define MASK_LIST_SIZE 8
 
 /*! A list of all possible combinations of keyboard lock masks */
-static unsigned int mask_list[MASK_LIST_SIZE];
+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()
 {
@@ -50,15 +53,23 @@ 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
+                                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;
     }
 
@@ -70,16 +81,23 @@ 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
+                               GrabModeAsync, None,
+                               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;
     }
@@ -91,16 +109,23 @@ 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,
+                               GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
-                               event_lasttime) == Success;
-        else
+                               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;
     }
@@ -152,7 +177,7 @@ void grab_shutdown(gboolean reconfig)
 }
 
 void grab_button_full(guint button, guint state, Window win, guint mask,
-                      int pointer_mode, ObCursor cur)
+                      gint pointer_mode, ObCursor cur)
 {
     guint i;
 
@@ -179,7 +204,7 @@ void ungrab_button(guint button, guint state, Window win)
         XUngrabButton(ob_display, button, state | mask_list[i], win);
 }
 
-void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
 {
     guint i;