no more interactive mouse actions, they are evil etc. actions now "feel" much more...

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 2d8877841fd1145de68b7eb59fbceb21291f460a..1e2f207bdc167132b53981c2b6106c0993ee7ce8 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,3 +1,4 @@
+#include "grab.h"
 #include "openbox.h"
 #include "event.h"
 #include "xerror.h"
@@ -30,6 +31,7 @@ gboolean grab_keyboard(gboolean grab)
             XUngrabKeyboard(ob_display, event_lasttime);
         ret = TRUE;
     }
+
     return ret;
 }
 
@@ -75,7 +77,7 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     return ret;
 }
 
-int grab_server(gboolean grab)
+gint grab_server(gboolean grab)
 {
     static guint sgrabs = 0;
     if (grab) {
@@ -92,10 +94,12 @@ int grab_server(gboolean grab)
     return sgrabs;
 }
 
-void grab_startup()
+void grab_startup(gboolean reconfig)
 {
     guint i = 0;
 
+    if (reconfig) return;
+
     mask_list[i++] = 0;
     mask_list[i++] = LockMask;
     mask_list[i++] = NumLockMask;
@@ -107,11 +111,13 @@ void grab_startup()
     g_assert(i == MASK_LIST_SIZE);
 }
 
-void grab_shutdown()
+void grab_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     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));
 }
 
@@ -120,14 +126,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)
@@ -146,7 +157,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);