don't raise the window when reverting from Escape

[chaz/openbox] / scripts / stackedcycle.py

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 5731a56456b82f641687d393d63ea48c18d9d6eb..9cfa051c34ea06014db5c5233fdf3ca5f35536cb 100644 (file)
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -93,11 +93,15 @@ class cycledata:
         oldpos = self.menupos
         self.menupos = -1
 
-        # get the list of clients
+        # get the list of clients, keeping iconic windows at the bottom
         self.clients = []
+        iconic_clients = []
         for i in focus._clients:
             c = ob.openbox.findClient(i)
-            if c: self.clients.append(c)
+            if c:
+                if c.iconic(): iconic_clients.append(c)
+                else: self.clients.append(c)
+        self.clients.extend(iconic_clients)
 
         font = self.style.labelFont()
         longest = 0
@@ -192,6 +196,8 @@ class cycledata:
             # popup disappears, screwing up the focus
             ob.mgrab(self.screen.number())
 
+        if not len(self.clients): return # don't both doing anything
+        
         self.menuwidgets[self.menupos].unfocus()
         if forward:
             self.menupos += 1
@@ -206,20 +212,23 @@ class cycledata:
 
     def grabfunc(self, data):
         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):
             done = 1
         # has Escape been pressed?
-        if data.action == ob.KeyAction.Press and data.key == "Escape":
+        elif data.action == ob.KeyAction.Press and data.key == "Escape":
             done = 1
+            notreverting = 0
             # revert
             self.menupos = 0
 
         if done:
             self.cycling = 0
             focus._disable = 0
-            self.activatetarget(1) # activate, and deiconify/unshade/raise
+            # activate, and deiconify/unshade/raise
+            self.activatetarget(notreverting)
             self.destroypopup()
             ob.kungrab()
             ob.mungrab()