#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;
gboolean ret = FALSE;
if (grab) {
- if (kgrabs++ == 0)
+ if (kgrabs++ == 0) {
ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
FALSE, GrabModeAsync, GrabModeAsync,
event_lasttime) == Success;
- else
+ if (!ret)
+ --kgrabs;
+ } else
ret = TRUE;
} else if (kgrabs > 0) {
if (--kgrabs == 0)
gboolean ret = FALSE;
if (grab) {
- if (pgrabs++ == 0)
+ if (pgrabs++ == 0) {
ret = XGrabPointer(ob_display, screen_support_win,
False, GRAB_PTR_MASK, GrabModeAsync,
GrabModeAsync, FALSE,
ob_cursor(cur), event_lasttime) == Success;
- else
+ if (!ret)
+ --pgrabs;
+ } else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
gboolean ret = FALSE;
if (grab) {
- if (pgrabs++ == 0)
+ if (pgrabs++ == 0) {
ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
GrabModeAsync, GrabModeAsync, TRUE,
ob_cursor(cur),
event_lasttime) == Success;
- else
+ if (!ret)
+ --pgrabs;
+ } else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
}
void grab_button_full(guint button, guint state, Window win, guint mask,
- int pointer_mode, ObCursor cur)
+ gint pointer_mode, ObCursor cur)
{
guint i;
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;