From 1a348576400b26dad3a58a81415c4c833fb4915c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 16 Dec 2009 15:17:08 -0500 Subject: Make the relative desktop switching actions interactive The desktop popup can now be shown "permanently" in which case it stays until you tell it to hide. --- openbox/actions.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'openbox/actions.c') diff --git a/openbox/actions.c b/openbox/actions.c index fda119c8..78546361 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -304,9 +304,12 @@ void actions_run_acts(GSList *acts, if (interactive_act) actions_interactive_cancel_act(); if (act->i_pre) - act->i_pre(act->options); - ok = actions_interactive_begin_act(act, state); + if (!act->i_pre(state, act->options)) + act->i_input = NULL; /* remove the interactivity */ } + /* check again cuz it might have been cancelled */ + if (actions_act_is_interactive(act)) + ok = actions_interactive_begin_act(act, state); } /* fire the action's run function with this data */ -- cgit v1.2.3