rm a stupid bb format

[chaz/openbox] / scripts / stackedcycle.py

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 376297e180679672a2066b1f1590a76ead848170..76658ae1fe9384ea6623a2a290e31c831fc017b6 100644 (file)
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -9,8 +9,11 @@ INCLUDE_ALL_DESKTOPS = 0
 """If this is non-zero then windows from all desktops will be included in
    the stacking list."""
 INCLUDE_ICONS = 1
-"""If this is non-zero then windows which are iconified will be included
-   in the stacking list."""
+"""If this is non-zero then windows which are iconified on the current desktop
+   will be included in the stacking list."""
+INCLUDE_ICONS_ALL_DESKTOPS = 1
+"""If this is non-zero then windows which are iconified from all desktops
+   will be included in the stacking list."""
 INCLUDE_OMNIPRESENT = 1
 """If this is non-zero then windows which are on all-desktops at once will
    be included."""
@@ -72,7 +75,11 @@ class _cycledata:
         if not (client.canFocus() or client.focusNotify()): return 0
         if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
 
-        if INCLUDE_ICONS and client.iconic(): return 1
+        if client.iconic():
+            if INCLUDE_ICONS:
+                if INCLUDE_ICONS_ALL_DESKTOPS: return 1
+                if desk == curdesk: return 1
+            return 0
         if INCLUDE_OMNIPRESENT and desk == 0xffffffff: return 1
         if INCLUDE_ALL_DESKTOPS: return 1
         if desk == curdesk: return 1
@@ -211,15 +218,18 @@ class _cycledata:
         done = 0
         notreverting = 1
         # have all the modifiers this started with been released?
-        if (data.action == ob.KeyAction.Release and
-            not self.state & data.state):
+        if not self.state & data.state:
             done = 1
-        # has Escape been pressed?
-        elif data.action == ob.KeyAction.Press and data.key == "Escape":
-            done = 1
-            notreverting = 0
-            # revert
-            self.menupos = 0
+        elif data.action == ob.KeyAction.Press:
+            # has Escape been pressed?
+            if data.key == "Escape":
+                done = 1
+                notreverting = 0
+                # revert
+                self.menupos = 0
+            # has Enter been pressed?
+            elif data.key == "Return":
+                done = 1
 
         if done:
             # activate, and deiconify/unshade/raise