include the desktop name if cycling on all desktops is enabled

[chaz/openbox] / scripts / stackedcycle.py

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 43507de389575e4181cc2255efb67723de67a604..376297e180679672a2066b1f1590a76ead848170 100644 (file)
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -113,14 +113,16 @@ class _cycledata:
             if current and c.window() == current.window():
                 self.menupos = i
                 w.setHighlighted(1)
-                pass
-            else:
-                w.setHighlighted(0)
-                pass
             self.menuwidgets.append(w)
 
             if c.iconic(): t = c.iconTitle()
             else: t = c.title()
+
+            if INCLUDE_ALL_DESKTOPS:
+                d = c.desktop()
+                if d == 0xffffffff: d = self.screen.desktop()
+                t = self.screen.desktopName(d) + " - " + t
+            
             if len(t) > TITLE_SIZE_LIMIT: # limit the length of titles
                 t = t[:TITLE_SIZE_LIMIT / 2 - 2] + "..." + \
                     t[0 - TITLE_SIZE_LIMIT / 2 - 2:]
@@ -147,9 +149,9 @@ class _cycledata:
         # show or hide the list and its child widgets
         if len(self.clients) > 1:
             size = self.screeninfo.size()
-            self.widget.resize(otk.Size(width, height))
-            self.widget.move(otk.Point((size.width() - width) / 2,
-                                       (size.height() - height) / 2))
+            self.widget.moveresize(otk.Rect((size.width() - width) / 2,
+                                            (size.height() - height) / 2,
+                                            width, height))
             self.widget.show(1)
 
     def activatetarget(self, final):
@@ -171,6 +173,8 @@ class _cycledata:
             ob.send_client_msg(self.screeninfo.rootWindow(),
                                otk.atoms.openbox_active_window,
                                client.window(), final, r)
+            if not final:
+                focus._skip += 1
 
     def cycle(self, data, forward):
         if not self.cycling:
@@ -181,7 +185,6 @@ class _cycledata:
             ob.mgrab(data.screen)
 
             self.cycling = 1
-            focus._disable = 1
             self.state = data.state
             self.screen = ob.openbox.screen(data.screen)
             self.screeninfo = otk.display.screenInfo(data.screen)
@@ -219,11 +222,10 @@ class _cycledata:
             self.menupos = 0
 
         if done:
-            self.cycling = 0
-            focus._disable = 0
             # activate, and deiconify/unshade/raise
             self.activatetarget(notreverting)
             self.destroypopup()
+            self.cycling = 0
             ob.kungrab()
             ob.mungrab()