static guint mask_list[MASK_LIST_SIZE];
static guint kgrabs = 0;
static guint pgrabs = 0;
+/*! The time at which the last grab was made */
+static Time grab_time = CurrentTime;
+
+static Time ungrab_time()
+{
+ Time t = event_curtime;
+ if (!(t == 0 || event_time_after(t, grab_time)))
+ t = grab_time;
+ return t;
+}
gboolean grab_on_keyboard()
{
if (kgrabs++ == 0) {
ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
FALSE, GrabModeAsync, GrabModeAsync,
- event_lasttime) == Success;
+ event_curtime) == Success;
if (!ret)
--kgrabs;
+ else
+ grab_time = event_curtime;
} else
ret = TRUE;
} else if (kgrabs > 0) {
- if (--kgrabs == 0)
- XUngrabKeyboard(ob_display, event_lasttime);
+ if (--kgrabs == 0) {
+ XUngrabKeyboard(ob_display, ungrab_time());
+ }
ret = TRUE;
}
ret = XGrabPointer(ob_display, screen_support_win,
False, GRAB_PTR_MASK, GrabModeAsync,
GrabModeAsync, None,
- ob_cursor(cur), event_lasttime) == Success;
+ ob_cursor(cur), event_curtime) == Success;
if (!ret)
--pgrabs;
+ else
+ grab_time = event_curtime;
} else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
- XUngrabPointer(ob_display, event_lasttime);
+ XUngrabPointer(ob_display, ungrab_time());
}
ret = TRUE;
}
ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
GrabModeAsync, GrabModeAsync, None,
ob_cursor(cur),
- event_lasttime) == Success;
+ event_curtime) == Success;
if (!ret)
--pgrabs;
+ else
+ grab_time = event_curtime;
} else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
- XUngrabPointer(ob_display, event_lasttime);
+ XUngrabPointer(ob_display, ungrab_time());
}
ret = TRUE;
}