nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the Focus action stop all interactive actions (Fixes bug #4436)

Browse source 
Old < 3.4.8 Openbox versions would stop focus cycling when focus moved.  Now that is not the case, but you should be able to stop it by Choosing a window explicitly still.
This commit is contained in:
Dana Jansens 2010-01-04 16:25:13 -05:00
parent 6d8b7bd5f7
commit 331990a4f2
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/actions/focus.c
View file

@ -6,6 +6,7 @@
typedef struct { typedef struct {
gboolean here; gboolean here;
gboolean stop_int;
} Options; } Options;
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); 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; Options *o;
o = g_new0(Options, 1); o = g_new0(Options, 1);
o->stop_int = TRUE;
if ((n = parse_find_node("here", node))) if ((n = parse_find_node("here", node)))
o->here = parse_bool(doc, n); o->here = parse_bool(doc, n);
if ((n = parse_find_node("stopInteractive", node)))
o->stop_int = parse_bool(doc, n);
return o; 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_CLIENT &&
data->context != OB_FRAME_CONTEXT_FRAME)) data->context != OB_FRAME_CONTEXT_FRAME))
{ {
if (o->stop_int)
actions_interactive_cancel_act();
actions_client_move(data, TRUE); actions_client_move(data, TRUE);
client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE); client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
actions_client_move(data, FALSE); actions_client_move(data, FALSE);
} }
} else if (data->context == OB_FRAME_CONTEXT_DESKTOP) { } 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 /* focus action on the root window. make keybindings work for this
openbox instance, but don't focus any specific client */ openbox instance, but don't focus any specific client */
focus_nothing(); focus_nothing();

7
openbox/focus_cycle.c
View file

@ -55,9 +55,10 @@ void focus_cycle_stop(ObClient *ifclient)
{ {
/* stop focus cycling if the given client is a valid focus target, /* stop focus cycling if the given client is a valid focus target,
and so the cycling is being disrupted */ and so the cycling is being disrupted */
if (focus_cycle_target && ifclient && if (focus_cycle_target &&
(ifclient == focus_cycle_target || ((ifclient && (ifclient == focus_cycle_target ||
focus_cycle_popup_is_showing(ifclient))) focus_cycle_popup_is_showing(ifclient))) ||
!ifclient))
{ {
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);