From c8983c42a7c27321d18825f2a130c15e29046f7b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 25 Apr 2007 14:13:32 +0000 Subject: [PATCH] playing a bit with grabs make mouse clicks cancel alt-tab and stuff if you arent dragging during the alt-tab --- openbox/grab.c | 9 ++------- openbox/grab.h | 1 - openbox/keyboard.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openbox/grab.c b/openbox/grab.c index e7bd41d9..eaf65f6b 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -166,18 +166,13 @@ void grab_button_full(guint button, guint state, Window win, guint mask, 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, ob_cursor(cur)); + XGrabButton(ob_display, button, state | mask_list[i], win, False, mask, + pointer_mode, GrabModeAsync, None, ob_cursor(cur)); xerror_set_ignore(FALSE); if (xerror_occured) ob_debug("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, OB_CURSOR_NONE); -} - void ungrab_button(guint button, guint state, Window win) { guint i; diff --git a/openbox/grab.h b/openbox/grab.h index 4b5aec3b..67dff212 100644 --- a/openbox/grab.h +++ b/openbox/grab.h @@ -34,7 +34,6 @@ gint grab_server(gboolean grab); gboolean grab_on_keyboard(); gboolean grab_on_pointer(); -void grab_button(guint button, guint state, Window win, guint mask); void grab_button_full(guint button, guint state, Window win, guint mask, gint pointer_mode, ObCursor cursor); void ungrab_button(guint button, guint state, Window win); diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 6adb0aa9..f9716c30 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -159,8 +159,11 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client, g_assert(action->data.any.interactive); if (!interactive_states) { - if (!grab_keyboard(TRUE)) + grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER); + if (!grab_keyboard(TRUE)) { + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); return FALSE; + } } s = g_new(ObInteractiveState, 1); @@ -186,6 +189,7 @@ void keyboard_interactive_end(ObInteractiveState *s, if (!interactive_states) { grab_keyboard(FALSE); + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); keyboard_reset_chains(); } } @@ -224,7 +228,9 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) done = TRUE; else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) cancel = done = TRUE; - } + } else if (e->type == ButtonPress) + cancel = done = TRUE; + if (done) { keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); -- 2.39.2