summaryrefslogtreecommitdiff
path: root/openbox/focus_cycle.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-01-04 16:25:13 -0500
committerDana Jansens <danakj@orodu.net>2010-01-04 16:25:13 -0500
commit331990a4f24aec35c6212af874d70bcc9cace258 (patch)
tree74e16f1e06b8af517353fe091416751df679d018 /openbox/focus_cycle.c
parent6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 (diff)
Make the Focus action stop all interactive actions (Fixes bug #4436)
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.
Diffstat (limited to 'openbox/focus_cycle.c')
-rw-r--r--openbox/focus_cycle.c7
1 files changed, 4 insertions, 3 deletions
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);