diff options
| -rw-r--r-- | openbox/actions/focus.c | 10 | ||||
| -rw-r--r-- | openbox/focus_cycle.c | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c index 8da8ed5e..1b544910 100644 --- a/openbox/actions/focus.c +++ b/openbox/actions/focus.c @@ -6,6 +6,7 @@ typedef struct { gboolean here; + gboolean stop_int; } Options; static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); @@ -27,9 +28,12 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) Options *o; o = g_new0(Options, 1); + o->stop_int = TRUE; if ((n = parse_find_node("here", node))) o->here = parse_bool(doc, n); + if ((n = parse_find_node("stopInteractive", node))) + o->stop_int = parse_bool(doc, n); return o; } @@ -56,11 +60,17 @@ static gboolean run_func(ObActionsData *data, gpointer options) (data->context != OB_FRAME_CONTEXT_CLIENT && data->context != OB_FRAME_CONTEXT_FRAME)) { + if (o->stop_int) + actions_interactive_cancel_act(); + actions_client_move(data, TRUE); client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE); actions_client_move(data, FALSE); } } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) { + if (o->stop_int) + actions_interactive_cancel_act(); + /* focus action on the root window. make keybindings work for this openbox instance, but don't focus any specific client */ focus_nothing(); diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 8d047497..c92b5a54 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -55,9 +55,10 @@ void focus_cycle_stop(ObClient *ifclient) { /* stop focus cycling if the given client is a valid focus target, and so the cycling is being disrupted */ - if (focus_cycle_target && ifclient && - (ifclient == focus_cycle_target || - focus_cycle_popup_is_showing(ifclient))) + if (focus_cycle_target && + ((ifclient && (ifclient == focus_cycle_target || + focus_cycle_popup_is_showing(ifclient))) || + !ifclient)) { focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); |