summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-22 15:58:09 +0000
committerDana Jansens <danakj@orodu.net>2007-04-22 15:58:09 +0000
commitd6e49acf0ff267b3ee9a9f1e0102028734803747 (patch)
tree001e65b83106c5a537162eedec989c27bfa9b90c
parent27773e1cb7492de080bd19189b4fcd2a6b9a0e9e (diff)
dont need to ignore mouse events during a keyboard grab, they go to the grab-window anyways
use our built in grab_keyboard
-rw-r--r--openbox/action.c2
-rw-r--r--openbox/event.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/openbox/action.c b/openbox/action.c
index fc6f5a78..5e42b68b 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1042,7 +1042,7 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
it won't work right unless we XUngrabKeyboard first,
even though we grabbed the key/button Asychronously.
e.g. "gnome-panel-control --main-menu" */
- XUngrabKeyboard(ob_display, event_curtime);
+ grab_keyboard(FALSE);
}
for (it = acts; it; it = g_slist_next(it)) {
diff --git a/openbox/event.c b/openbox/event.c
index 502d1962..ca60d6f3 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -591,8 +591,7 @@ static void event_process(const XEvent *ec, gpointer data)
if (e->type == ButtonPress || e->type == ButtonRelease ||
e->type == MotionNotify) {
- if (!keyboard_interactively_grabbed())
- mouse_event(client, e);
+ mouse_event(client, e);
} else if (e->type == KeyPress) {
keyboard_event((focus_cycle_target ? focus_cycle_target :
(focus_hilite ? focus_hilite : client)),