X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=1e2f207bdc167132b53981c2b6106c0993ee7ce8;hb=af9fea15dd06ddfb641f92fd330e7126050fc02c;hp=599fb6815a19444712725e124b4b8139bf70e792;hpb=4d9a46bec018d3356611bcbde83202e328e6ae85;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 599fb681..1e2f207b 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,3 +1,4 @@
+#include "grab.h"
 #include "openbox.h"
 #include "event.h"
 #include "xerror.h"
@@ -76,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) {
@@ -93,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;
@@ -108,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));
 }
 
@@ -133,7 +138,7 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 
 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)