summaryrefslogtreecommitdiff
path: root/openbox/actions
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/actions')
-rw-r--r--openbox/actions/focus.c10
1 files changed, 10 insertions, 0 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();