Fix skip-empty & skip-occupied options with all-outputs enabled

NickHastings · May 12, 2024 · ec8c061 · ec8c061
1 parent c322b52
commit ec8c061
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/riverwm_utils/riverwm_utils.py b/riverwm_utils/riverwm_utils.py
@@ -320,9 +320,15 @@ def cycle_focused_tags():
     prepare_display(display)
 
     used_tags = (1 << args.n_tags) - 1
+
     tags = SEAT.focused_output.focused_tags & used_tags
-    view_tags = SEAT.focused_output.view_tags
-    occupied_tags = get_occupied_tags(view_tags) & used_tags
+    if args.all_outputs and len(OUTPUTS) > 1:
+        occupied_tags = 0
+        for output in OUTPUTS:
+            occupied_tags |= get_occupied_tags(output.view_tags) & used_tags
+    else:
+        occupied_tags = get_occupied_tags(SEAT.focused_output.view_tags) & used_tags
+
     if args.debug:
         print(f'occ 0b{occupied_tags:032b}')