track window groups

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index f90eb6b537d6964a34a5611f8b15f812a69e2da7..5e6209e0561cb7dc70326328e6e0148d73910d12 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "event.h"
+#include "xerror.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -87,7 +88,7 @@ void grab_button(guint button, guint state, Window win, guint mask,
 
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask,
-                    pointer_mode, GrabModeAsync, None, None);
+                    pointer_mode, GrabModeSync, None, None);
 }
 
 void ungrab_button(guint button, guint state, Window win)
@@ -102,9 +103,14 @@ void grab_key(guint keycode, guint state, int keyboard_mode)
 {
     guint i;
 
+    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
+    xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE,
-                 GrabModeAsync, keyboard_mode);
+                 GrabModeSync, keyboard_mode);
+    xerror_set_ignore(FALSE);
+    if (xerror_occured)
+        g_warning("failed to grab keycode %d modifiers %d", keycode, state);
 }
 
 void ungrab_all_keys()