X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=1e2f207bdc167132b53981c2b6106c0993ee7ce8;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=dd880c5f37e300d08600cfd6d98d7cd8fbb2822a;hpb=d3dd25a55cf7e1837eaf45b04ed2d20392eb559b;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index dd880c5f..1e2f207b 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -1,3 +1,4 @@ +#include "grab.h" #include "openbox.h" #include "event.h" #include "xerror.h" @@ -20,33 +21,42 @@ gboolean grab_keyboard(gboolean grab) if (grab) { if (kgrabs++ == 0) - ret = XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync, - GrabModeAsync, event_lasttime) == Success; + ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen), + FALSE, GrabModeAsync, GrabModeAsync, + event_lasttime) == Success; + else + ret = TRUE; } else if (kgrabs > 0) { if (--kgrabs == 0) XUngrabKeyboard(ob_display, event_lasttime); + ret = TRUE; } + return ret; } -gboolean grab_pointer(gboolean grab, Cursor cur) +gboolean grab_pointer(gboolean grab, ObCursor cur) { static guint pgrabs = 0; gboolean ret = FALSE; if (grab) { if (pgrabs++ == 0) - ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK, - GrabModeAsync, GrabModeAsync, FALSE, cur, - event_lasttime) == Success; + ret = XGrabPointer(ob_display, RootWindow(ob_display, ob_screen), + False, GRAB_PTR_MASK, GrabModeAsync, + GrabModeAsync, FALSE, + ob_cursor(cur), event_lasttime) == Success; + else + ret = TRUE; } else if (pgrabs > 0) { if (--pgrabs == 0) XUngrabPointer(ob_display, event_lasttime); + ret = TRUE; } return ret; } -gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win) +gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win) { static guint pgrabs = 0; gboolean ret = FALSE; @@ -54,16 +64,20 @@ gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win) if (grab) { if (pgrabs++ == 0) ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, - GrabModeAsync, GrabModeAsync, TRUE, cur, + GrabModeAsync, GrabModeAsync, TRUE, + ob_cursor(cur), event_lasttime) == Success; + else + ret = TRUE; } else if (pgrabs > 0) { if (--pgrabs == 0) XUngrabPointer(ob_display, event_lasttime); + ret = TRUE; } return ret; } -int grab_server(gboolean grab) +gint grab_server(gboolean grab) { static guint sgrabs = 0; if (grab) { @@ -80,10 +94,12 @@ int grab_server(gboolean grab) return sgrabs; } -void grab_startup() +void grab_startup(gboolean reconfig) { guint i = 0; + if (reconfig) return; + mask_list[i++] = 0; mask_list[i++] = LockMask; mask_list[i++] = NumLockMask; @@ -95,27 +111,34 @@ void grab_startup() g_assert(i == MASK_LIST_SIZE); } -void grab_shutdown() +void grab_shutdown(gboolean reconfig) { + if (reconfig) return; + while (grab_keyboard(FALSE)); - while (grab_pointer(FALSE, None)); - while (grab_pointer_window(FALSE, None, None)); + while (grab_pointer(FALSE, OB_CURSOR_NONE)); + while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None)); while (grab_server(FALSE)); } void grab_button_full(guint button, guint state, Window win, guint mask, - int pointer_mode, Cursor cursor) + int pointer_mode, ObCursor cur) { guint i; + xerror_set_ignore(TRUE); /* can get BadAccess' from these */ + xerror_occured = FALSE; for (i = 0; i < MASK_LIST_SIZE; ++i) XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask, - pointer_mode, GrabModeSync, None, cursor); + pointer_mode, GrabModeSync, None, ob_cursor(cur)); + xerror_set_ignore(FALSE); + if (xerror_occured) + g_warning("failed to grab button %d modifiers %d", button, state); } void grab_button(guint button, guint state, Window win, guint mask) { - grab_button_full(button, state, win, mask, GrabModeAsync, None); + grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE); } void ungrab_button(guint button, guint state, Window win) @@ -134,7 +157,7 @@ void grab_key(guint keycode, guint state, Window win, int keyboard_mode) xerror_occured = FALSE; for (i = 0; i < MASK_LIST_SIZE; ++i) XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE, - GrabModeSync, keyboard_mode); + GrabModeAsync, keyboard_mode); xerror_set_ignore(FALSE); if (xerror_occured) g_warning("failed to grab keycode %d modifiers %d", keycode, state);