X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=549b0f1f0b1d055e3302a1b7ca5e421f232a3cfe;hb=950b85b9880012ed45b81854b5b5865b1de08a87;hp=dd880c5f37e300d08600cfd6d98d7cd8fbb2822a;hpb=d3dd25a55cf7e1837eaf45b04ed2d20392eb559b;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index dd880c5f..549b0f1f 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -20,33 +20,41 @@ gboolean grab_keyboard(gboolean grab)
 
     if (grab) {
         if (kgrabs++ == 0)
-            ret = XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
-                                GrabModeAsync, event_lasttime) == Success;
+            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 ret;
 }
 
-gboolean 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)
-            ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, FALSE, cur,
-                               event_lasttime) == Success;
+            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 ret;
 }
 
-gboolean 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;
@@ -54,11 +62,15 @@ gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win)
     if (grab) {
         if (pgrabs++ == 0)
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE, cur,
+                               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 ret;
 }
@@ -104,13 +116,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)