summaryrefslogtreecommitdiff
path: root/openbox/event.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/event.c')
-rw-r--r--openbox/event.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/openbox/event.c b/openbox/event.c
index c744e3ab..79d35077 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -487,17 +487,14 @@ static void event_process(const XEvent *ec, gpointer data)
{
if (menu_frame_visible)
event_handle_menu(e);
- else if (moveresize_in_progress)
- moveresize_event(e);
else {
- ObFrameContext context;
+ if (!keyboard_process_interactive_grab(e)) {
+ if (moveresize_in_progress)
+ moveresize_event(e);
- context = frame_context(client, e->xany.window);
-
- if (!keyboard_process_interactive_grab(e, &client, &context)) {
if (e->type == ButtonPress || e->type == ButtonRelease ||
e->type == MotionNotify)
- mouse_event(client, context, e);
+ mouse_event(client, e);
else if (e->type == KeyPress)
/* when in the middle of a focus cycling action, this
causes the window which appears to be focused to be