allow the use of keycodes directly in key bindings

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 5df654c62a6c3dc6eb6179341b5dc562ed558432..96e5873e155955a033a08120da13a8679ea9e2d2 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,6 +1,8 @@
+#include "grab.h"
 #include "openbox.h"
 #include "event.h"
 #include "xerror.h"
+#include "screen.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -41,7 +43,7 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
 
     if (grab) {
         if (pgrabs++ == 0)
-            ret = XGrabPointer(ob_display, RootWindow(ob_display, ob_screen),
+            ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
                                GrabModeAsync, FALSE,
                                ob_cursor(cur), event_lasttime) == Success;
@@ -76,7 +78,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) {
@@ -93,10 +95,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;
@@ -108,8 +112,10 @@ 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, OB_CURSOR_NONE));
     while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));