X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=1515a3a9932411bd8a2cfefc3017e19082ed2aa8;hb=df1ef6b8adf6347030335541c33cb53173550728;hp=31d8494a660869e71d84092e550493cb5ea2bdbe;hpb=9bd60fd92b8ff09630b35973947493a23015c621;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 31d8494a..1515a3a9 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -31,7 +31,7 @@
 #define MASK_LIST_SIZE 8
 
 /*! A list of all possible combinations of keyboard lock masks */
-static unsigned int mask_list[MASK_LIST_SIZE];
+static guint mask_list[MASK_LIST_SIZE];
 static guint kgrabs = 0;
 static guint pgrabs = 0;
 
@@ -75,9 +75,8 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
-                               GrabModeAsync, FALSE,
+                               GrabModeAsync, None,
                                ob_cursor(cur), event_lasttime) == Success;
-            ob_debug("GRABBING\n");
             if (!ret)
                 --pgrabs;
         } else
@@ -85,9 +84,6 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
-
-            ob_debug("UNGRABBING\n");
-            event_ignore_queued_enters();
         }
         ret = TRUE;
     }
@@ -101,7 +97,7 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     if (grab) {
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE,
+                               GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
                                event_lasttime) == Success;
             if (!ret)
@@ -162,7 +158,7 @@ void grab_shutdown(gboolean reconfig)
 }
 
 void grab_button_full(guint button, guint state, Window win, guint mask,
-                      int pointer_mode, ObCursor cur)
+                      gint pointer_mode, ObCursor cur)
 {
     guint i;
 
@@ -189,7 +185,7 @@ void ungrab_button(guint button, guint state, Window win)
         XUngrabButton(ob_display, button, state | mask_list[i], win);
 }
 
-void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
 {
     guint i;