button presses which run actions during interactive actions will cancel the action. when you cancel switching desktops, don't go back, just stop.
Dana Jansens danakj@orodu.net
2 files changed,
2 insertions(+),
11 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -1521,11 +1521,6 @@ }
void action_desktop(union ActionData *data) { - static guint first = (unsigned) -1; - - if (data->inter.any.interactive && first == (unsigned) -1) - first = screen_desktop; - if (!data->inter.any.interactive || (!data->inter.cancel && !data->inter.final)) {@@ -1536,14 +1531,10 @@ screen_set_desktop(data->desktop.desk, TRUE);
if (data->inter.any.interactive) screen_desktop_popup(data->desktop.desk, TRUE); } - } else if (data->inter.cancel) { - screen_set_desktop(first, TRUE); } - if (!data->inter.any.interactive || data->inter.final) { + if (!data->inter.any.interactive || data->inter.final) screen_desktop_popup(0, FALSE); - first = (unsigned) -1; - } } void action_desktop_dir(union ActionData *data)
M
openbox/keyboard.c
→
openbox/keyboard.c
@@ -249,7 +249,7 @@ cancel = done = TRUE;
handled = TRUE; } } else if (e->type == ButtonPress) { - cancel = FALSE; + cancel = TRUE; done = TRUE; handled = FALSE; }