#include <glib.h>
#include <X11/Xlib.h>
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | \
+ PointerMotionMask | EnterWindowMask | LeaveWindowMask)
#define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MASK_LIST_SIZE 8
/*! The time at which the last grab was made */
static Time grab_time = CurrentTime;
+static Time ungrab_time()
+{
+ Time t = event_curtime;
+ if (!(t == CurrentTime || event_time_after(t, grab_time)))
+ /* When the time moves backward on the server, then we can't use
+ the grab time because that will be in the future. So instead we
+ have to use CurrentTime.
+
+ "XUngrabPointer does not release the pointer if the specified time
+ is earlier than the last-pointer-grab time or is later than the
+ current X server time."
+ */
+ t = CurrentTime; /*grab_time;*/
+ return t;
+}
+
gboolean grab_on_keyboard()
{
return kgrabs > 0;
ret = TRUE;
} else if (kgrabs > 0) {
if (--kgrabs == 0) {
- Time t = event_curtime;
- if (t != 0 && t < grab_time)
- t = grab_time;
- XUngrabKeyboard(ob_display, t);
+ XUngrabKeyboard(ob_display, ungrab_time());
}
ret = TRUE;
}
if (grab) {
if (pgrabs++ == 0) {
ret = XGrabPointer(ob_display, screen_support_win,
- False, GRAB_PTR_MASK, GrabModeAsync,
+ True, GRAB_PTR_MASK, GrabModeAsync,
GrabModeAsync, None,
ob_cursor(cur), event_curtime) == Success;
if (!ret)
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
- Time t = event_curtime;
- if (t != 0 && t < grab_time)
- t = grab_time;
- XUngrabPointer(ob_display, event_curtime);
+ XUngrabPointer(ob_display, ungrab_time());
}
ret = TRUE;
}
if (grab) {
if (pgrabs++ == 0) {
- ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+ ret = XGrabPointer(ob_display, win, True, GRAB_PTR_MASK,
GrabModeAsync, GrabModeAsync, None,
ob_cursor(cur),
event_curtime) == Success;
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
- Time t = event_curtime;
- if (t != 0 && t < grab_time)
- t = grab_time;
- XUngrabPointer(ob_display, event_curtime);
+ XUngrabPointer(ob_display, ungrab_time());
}
ret = TRUE;
}