#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) {
XUngrabPointer(ob_display, event_lasttime);
-
- /* ignore all enter events caused by ungrabbing the pointer */
- {
- GSList *saved = NULL, *it;
- XEvent *e;
- guint n = 0;
-
- XSync(ob_display, FALSE);
-
- /* count the events */
- while (TRUE) {
- e = g_new(XEvent, 1);
- if (XCheckTypedEvent(ob_display, EnterNotify, e)) {
- saved = g_slist_append(saved, e);
- ++n;
- } else {
- g_free(e);
- break;
- }
- }
- /* put the events back */
- for (it = saved; it; it = g_slist_next(it)) {
- XPutBackEvent(ob_display, it->data);
- g_free(it->data);
- }
- g_slist_free(saved);
- /* ignore the events */
- event_ignore_enter_focus(n);
- }
}
ret = TRUE;
}
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)
+ if (--pgrabs == 0) {
XUngrabPointer(ob_display, event_lasttime);
+ }
ret = TRUE;
}
return ret;
}
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;