/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
grab.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
This program is free software; you can redistribute it and/or modify
#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;
+/*! 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()
{
if (grab) {
if (kgrabs++ == 0) {
ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
- FALSE, GrabModeAsync, GrabModeAsync,
- event_lasttime) == Success;
+ False, GrabModeAsync, GrabModeAsync,
+ 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);
- ret = TRUE;
- }
-
- return ret;
-}
-
-gboolean grab_pointer(gboolean grab, ObCursor cur)
-{
- gboolean ret = FALSE;
-
- if (grab) {
- if (pgrabs++ == 0) {
- ret = XGrabPointer(ob_display, screen_support_win,
- False, GRAB_PTR_MASK, GrabModeAsync,
- GrabModeAsync, FALSE,
- ob_cursor(cur), event_lasttime) == Success;
- if (!ret)
- --pgrabs;
- } else
- ret = TRUE;
- } else if (pgrabs > 0) {
- if (--pgrabs == 0) {
- XUngrabPointer(ob_display, event_lasttime);
+ if (--kgrabs == 0) {
+ XUngrabKeyboard(ob_display, ungrab_time());
}
ret = TRUE;
}
+
return ret;
}
-gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
+gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur)
{
gboolean ret = FALSE;
if (grab) {
if (pgrabs++ == 0) {
- ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
- GrabModeAsync, GrabModeAsync, TRUE,
- ob_cursor(cur),
- event_lasttime) == Success;
+ ret = XGrabPointer(ob_display, screen_support_win, owner_events,
+ GRAB_PTR_MASK,
+ GrabModeAsync, GrabModeAsync, None,
+ 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;
}
if (reconfig) return;
while (grab_keyboard(FALSE));
- while (grab_pointer(FALSE, OB_CURSOR_NONE));
- while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
+ while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE));
while (grab_server(FALSE));
}
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;