X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fstackedcycle.py;h=376297e180679672a2066b1f1590a76ead848170;hb=d993bcd9ad035a4f38cb7a3733586ee36bf2dfc9;hp=59dbc98e421265c961d79e453bac88e937083fa5;hpb=ef231de58a738c83bf505e184fbafa9077f7452e;p=chaz%2Fopenbox

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 59dbc98e..376297e1 100644
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -117,6 +117,12 @@ class _cycledata:
 
             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:]
@@ -167,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:
@@ -177,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)
@@ -215,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()