summaryrefslogtreecommitdiff
path: root/openbox/focus_cycle.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/focus_cycle.c')
-rw-r--r--openbox/focus_cycle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 46f5f058..74cabac6 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -150,7 +150,11 @@ gboolean focus_cycle_target_valid(ObClient *ft,
!ft->skip_taskbar);
/* it's not going to just send fous off somewhere else (modal window) */
- ok = ok && ft == client_focus_target(ft);
+ {
+ ObClient *cft = client_focus_target(ft);
+ ok = ok && (ft == cft || (cft->desktop != DESKTOP_ALL &&
+ cft->desktop != ft->desktop));
+ }
return ok;
}