#include <glib.h>
#include <X11/Xlib.h>
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
#define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MASK_LIST_SIZE 8
/*! A list of all possible combinations of keyboard lock masks */
static unsigned int mask_list[MASK_LIST_SIZE];
-int grab_keyboard(gboolean grab)
+gboolean grab_keyboard(gboolean grab)
{
static guint kgrabs = 0;
+ gboolean ret = FALSE;
+
if (grab) {
if (kgrabs++ == 0)
- XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
- GrabModeAsync, event_lasttime);
+ ret = XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
+ GrabModeAsync, event_lasttime) == Success;
} else if (kgrabs > 0) {
if (--kgrabs == 0)
XUngrabKeyboard(ob_display, event_lasttime);
}
- return kgrabs;
+ return ret;
}
-int grab_pointer(gboolean grab, Cursor cur)
+gboolean grab_pointer(gboolean grab, Cursor cur)
{
static guint pgrabs = 0;
+ gboolean ret = FALSE;
+
if (grab) {
if (pgrabs++ == 0)
- XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
- GrabModeAsync, GrabModeAsync, FALSE, cur,
- event_lasttime);
+ ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
+ GrabModeAsync, GrabModeAsync, FALSE, cur,
+ event_lasttime) == Success;
} else if (pgrabs > 0) {
if (--pgrabs == 0)
XUngrabPointer(ob_display, event_lasttime);
}
- return pgrabs;
+ return ret;
}
-int grab_pointer_window(gboolean grab, Cursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win)
{
static guint pgrabs = 0;
+ gboolean ret = FALSE;
+
if (grab) {
if (pgrabs++ == 0)
- XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, GrabModeAsync,
- GrabModeAsync, TRUE, cur, event_lasttime);
+ ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+ GrabModeAsync, GrabModeAsync, TRUE, cur,
+ event_lasttime) == Success;
} else if (pgrabs > 0) {
if (--pgrabs == 0)
XUngrabPointer(ob_display, event_lasttime);
}
- return pgrabs;
+ return ret;
}
int grab_server(gboolean grab)
XUngrabButton(ob_display, button, state | mask_list[i], win);
}
-void grab_key(guint keycode, guint state, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
{
guint i;
xerror_set_ignore(TRUE); /* can get BadAccess' from these */
xerror_occured = FALSE;
for (i = 0; i < MASK_LIST_SIZE; ++i)
- XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE,
+ XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
GrabModeSync, keyboard_mode);
xerror_set_ignore(FALSE);
if (xerror_occured)
g_warning("failed to grab keycode %d modifiers %d", keycode, state);
}
-void ungrab_all_keys()
+void ungrab_all_keys(Window win)
{
- XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
+ XUngrabKey(ob_display, AnyKey, AnyModifier, win);
}