X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=91f7915cbe7b5661575918fbdedf308336482197;hb=def76092b587e7e9a2b212dc5211773e336525e1;hp=31d8494a660869e71d84092e550493cb5ea2bdbe;hpb=9bd60fd92b8ff09630b35973947493a23015c621;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index 31d8494a..91f7915c 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; @@ -77,7 +77,6 @@ gboolean grab_pointer(gboolean grab, ObCursor cur) False, GRAB_PTR_MASK, GrabModeAsync, GrabModeAsync, FALSE, 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; } @@ -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;