From 2c6c0757fa497f4c1e0648bcbb1927c0fa12862f Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 30 Aug 2003 16:58:30 +0000 Subject: make interactive actions a type and not special cases. add the option to them to turn off interactivity --- openbox/mouse.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'openbox/mouse.c') 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); } -- cgit v1.2.3