summaryrefslogtreecommitdiff
path: root/openbox/mouse.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/mouse.c')
-rw-r--r--openbox/mouse.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 2e8507c3..15d77ae6 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -115,21 +115,9 @@ static gboolean fire_button(ObMouseAction a, ObFrameContext context,
act->data.showmenu.y = y;
}
- if (act->func == action_desktop_dir)
- {
- act->data.desktopdir.final = FALSE;
- act->data.desktopdir.cancel = FALSE;
- }
- if (act->func == action_send_to_desktop_dir)
- {
- act->data.sendtodir.final = FALSE;
- act->data.sendtodir.cancel = FALSE;
- }
-
- if (config_desktop_popup &&
- (act->func == action_desktop_dir ||
- act->func == action_send_to_desktop_dir))
- {
+ if (act->data.any.interactive) {
+ act->data.inter.cancel = FALSE;
+ act->data.inter.final = FALSE;
keyboard_interactive_grab(state, c, context, act);
}