diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-16 15:17:08 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-17 10:33:06 -0500 |
| commit | 1a348576400b26dad3a58a81415c4c833fb4915c (patch) | |
| tree | 39bbdd4efba2b2d7d9e270db837737ad9dab5db3 /openbox/actions.c | |
| parent | 1b392b5fbe85c55cda2b0fc9d1e10cbe56216185 (diff) | |
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.
Diffstat (limited to 'openbox/actions.c')
| -rw-r--r-- | openbox/actions.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 */ |