X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=5df654c62a6c3dc6eb6179341b5dc562ed558432;hb=506fa94dc74c34ee90af19353184029a76d206e4;hp=3f87f3b0b7d07568a563c8d715e0c3e6307d61af;hpb=276b2be581c6cb138b439537761ff2ca42201805;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 3f87f3b0..5df654c6 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -20,8 +20,9 @@ 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) {
@@ -29,6 +30,7 @@ gboolean grab_keyboard(gboolean grab)
             XUngrabKeyboard(ob_display, event_lasttime);
         ret = TRUE;
     }
+
     return ret;
 }
 
@@ -39,10 +41,10 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
 
     if (grab) {
         if (pgrabs++ == 0)
-            ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, FALSE,
-                               ob_cursor(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) {
@@ -109,8 +111,8 @@ void grab_startup()
 void grab_shutdown()
 {
     while (grab_keyboard(FALSE));
-    while (grab_pointer(FALSE, None));
-    while (grab_pointer_window(FALSE, None, None));
+    while (grab_pointer(FALSE, OB_CURSOR_NONE));
+    while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
     while (grab_server(FALSE));
 }
 
@@ -119,14 +121,19 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 {
     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, 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)
 {
-    grab_button_full(button, state, win, mask, GrabModeAsync, None);
+    grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE);
 }
 
 void ungrab_button(guint button, guint state, Window win)
@@ -145,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);