X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=599fb6815a19444712725e124b4b8139bf70e792;hb=4d9a46bec018d3356611bcbde83202e328e6ae85;hp=e934959ddf794e82c3a7b64a5d35bfd95488d29d;hpb=795d90c3bc57eaf2c98c447f3af5c1c9e7a52fa3;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index e934959d..599fb681 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -5,7 +5,7 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
 #define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
 
 #define MASK_LIST_SIZE 8
@@ -13,47 +13,67 @@
 /*! A list of all possible combinations of keyboard lock masks */
 static unsigned int mask_list[MASK_LIST_SIZE];
 
-int grab_keyboard(gboolean grab)
+gboolean grab_keyboard(gboolean grab)
 {
     static guint kgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (kgrabs++ == 0)
-            XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
-                          GrabModeAsync, event_lasttime);
+            ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
+                                FALSE, GrabModeAsync, GrabModeAsync,
+                                event_lasttime) == Success;
+        else
+            ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
             XUngrabKeyboard(ob_display, event_lasttime);
+        ret = TRUE;
     }
-    return kgrabs;
+
+    return ret;
 }
 
-int grab_pointer(gboolean grab, Cursor cur)
+gboolean grab_pointer(gboolean grab, ObCursor cur)
 {
     static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
-                         GrabModeAsync, GrabModeAsync, FALSE, cur,
-                         event_lasttime);
+            ret = XGrabPointer(ob_display, RootWindow(ob_display, ob_screen),
+                               False, GRAB_PTR_MASK, GrabModeAsync,
+                               GrabModeAsync, FALSE,
+                               ob_cursor(cur), event_lasttime) == Success;
+        else
+            ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
             XUngrabPointer(ob_display, event_lasttime);
+        ret = TRUE;
     }
-    return pgrabs;
+    return ret;
 }
 
-int grab_pointer_window(gboolean grab, Cursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
 {
     static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, GrabModeAsync,
-                         GrabModeAsync, TRUE, cur, event_lasttime);
+            ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+                               GrabModeAsync, GrabModeAsync, TRUE,
+                               ob_cursor(cur),
+                               event_lasttime) == Success;
+        else
+            ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
             XUngrabPointer(ob_display, event_lasttime);
+        ret = TRUE;
     }
-    return pgrabs;
+    return ret;
 }
 
 int grab_server(gboolean grab)
@@ -97,13 +117,18 @@ void grab_shutdown()
 }
 
 void grab_button_full(guint button, guint state, Window win, guint mask,
-                      int pointer_mode, Cursor cursor)
+                      int pointer_mode, ObCursor cur)
 {
     guint i;
 
+    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
+    xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask,
-                    pointer_mode, GrabModeSync, None, cursor);
+                    pointer_mode, GrabModeSync, None, ob_cursor(cur));
+    xerror_set_ignore(FALSE);
+    if (xerror_occured)
+        g_warning("failed to grab button %d modifiers %d", button, state);
 }
 
 void grab_button(guint button, guint state, Window win, guint mask)
@@ -127,7 +152,7 @@ void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
     xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
-                 GrabModeSync, keyboard_mode);
+                 GrabModeAsync, keyboard_mode);
     xerror_set_ignore(FALSE);
     if (xerror_occured)
         g_warning("failed to grab keycode %d modifiers %d", keycode, state);