X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=a8a6200efa246b62e12bce1192ac90427789b37d;hb=854b2ae68498133f3119ec614b725025af3fd66b;hp=a53fe5e8241039a92ccfe4c8067740cfd5989ae3;hpb=32047fd66c796fe837168ce2ac6677aa0d2b20b4;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index a53fe5e8..a8a6200e 100644
--- 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
@@ -25,15 +26,34 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | \
+                       PointerMotionMask | EnterWindowMask | LeaveWindowMask)
 #define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
 
 #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;
+
+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()
 {
@@ -50,15 +70,20 @@ 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) {
+            XUngrabKeyboard(ob_display, ungrab_time());
+        }
         ret = TRUE;
     }
 
@@ -70,16 +95,21 @@ 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
+                               True, GRAB_PTR_MASK, GrabModeAsync,
+                               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);
+        if (--pgrabs == 0) {
+            XUngrabPointer(ob_display, ungrab_time());
+        }
         ret = TRUE;
     }
     return ret;
@@ -90,16 +120,21 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     gboolean ret = FALSE;
 
     if (grab) {
-        if (pgrabs++ == 0)
-            ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE,
+        if (pgrabs++ == 0) {
+            ret = XGrabPointer(ob_display, win, True, GRAB_PTR_MASK,
+                               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);
+        if (--pgrabs == 0) {
+            XUngrabPointer(ob_display, ungrab_time());
+        }
         ret = TRUE;
     }
     return ret;
@@ -150,7 +185,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;
 
@@ -177,7 +212,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;