X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fstackedcycle.py;h=bfeaf31d918333ad601282b606c035f3881c26c8;hb=3ca451fc00eccb2ded41cc4b02e51fd4ad0c3265;hp=268b80d673d32d94db866d57dfe5afe5171e5616;hpb=84dfca1c30727bc5916903d1f9e1683e9b43f891;p=chaz%2Fopenbox

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 268b80d6..bfeaf31d 100644
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -4,21 +4,39 @@
 
 ###########################################################################
 ###    Options that affect the behavior of the stackedcycle module.     ###
-###              Also see the options in the focus module.              ###
 ###########################################################################
-include_all_desktops = 0
-include_icons = 1
-include_omnipresent = 1
-title_size_limit = 80
-activate_while_cycling = 1
+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."""
+INCLUDE_OMNIPRESENT = 1
+"""If this is non-zero then windows which are on all-desktops at once will
+   be included."""
+TITLE_SIZE_LIMIT = 80
+"""This specifies a rough limit of characters for the cycling list titles.
+   Titles which are larger will be chopped with an elipsis in their
+   center."""
+ACTIVATE_WHILE_CYCLING = 1
+"""If this is non-zero then windows will be activated as they are
+   highlighted in the cycling list (except iconified windows)."""
+# See focus.AVOID_SKIP_TASKBAR
+# See focuscycle.RAISE_WINDOW
 ###########################################################################
 
 def next(data):
     """Focus the next window."""
+    if not data.state:
+        raise RuntimeError("stackedcycle.next must be bound to a key" +
+                           "combination with at least one modifier")
     _o.cycle(data, 1)
     
 def previous(data):
     """Focus the previous window."""
+    if not data.state:
+        raise RuntimeError("stackedcycle.previous must be bound to a key" +
+                           "combination with at least one modifier")
     _o.cycle(data, 0)
 
 ###########################################################################
@@ -31,8 +49,9 @@ def previous(data):
 import otk
 import ob
 import focus
+import focuscycle
 
-class cycledata:
+class _cycledata:
     def __init__(self):
         self.cycling = 0
 
@@ -53,11 +72,11 @@ class cycledata:
 
         if not client.normal(): return 0
         if not (client.canFocus() or client.focusNotify()): return 0
-        if focus.avoid_skip_taskbar and client.skipTaskbar(): return 0
+        if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
 
-        if include_icons and client.iconic(): return 1
-        if include_omnipresent and desk == 0xffffffff: return 1
-        if include_all_desktops: return 1
+        if INCLUDE_ICONS and client.iconic(): return 1
+        if INCLUDE_OMNIPRESENT and desk == 0xffffffff: return 1
+        if INCLUDE_ALL_DESKTOPS: return 1
         if desk == curdesk: return 1
 
         return 0
@@ -74,11 +93,13 @@ 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 = []
-        for i in focus._clients:
-            c = ob.openbox.findClient(i)
-            if c: self.clients.append(c)
+        iconic_clients = []
+        for c in focus._clients:
+            if c.iconic(): iconic_clients.append(c)
+            else: self.clients.append(c)
+        self.clients.extend(iconic_clients)
 
         font = self.style.labelFont()
         longest = 0
@@ -104,9 +125,9 @@ class cycledata:
 
             if c.iconic(): t = c.iconTitle()
             else: t = c.title()
-            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:]
+            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:]
             length = font.measureString(t)
             if length > longest: longest = length
             w.setText(t)
@@ -144,15 +165,15 @@ class cycledata:
         if not (client.iconic() or client.desktop() == 0xffffffff or \
                 client.desktop() == self.screen.desktop()):
             root = self.screeninfo.rootWindow()
-            ob.send_client_msg(root, otk.Property_atoms().net_current_desktop,
+            ob.send_client_msg(root, otk.atoms.net_current_desktop,
                                root, client.desktop())
         
         # send a net_active_window message for the target
         if final or not client.iconic():
-            if final: r = focus.raise_window
+            if final: r = focuscycle.RAISE_WINDOW
             else: r = 0
             ob.send_client_msg(self.screeninfo.rootWindow(),
-                               otk.Property_atoms().openbox_active_window,
+                               otk.atoms.openbox_active_window,
                                client.window(), final, r)
 
     def cycle(self, data, forward):
@@ -173,6 +194,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
@@ -182,20 +205,31 @@ class cycledata:
         if self.menupos < 0: self.menupos = len(self.clients) - 1
         elif self.menupos >= len(self.clients): self.menupos = 0
         self.menuwidgets[self.menupos].focus()
-        if activate_while_cycling:
+        if ACTIVATE_WHILE_CYCLING:
             self.activatetarget(0) # activate, but dont deiconify/unshade/raise
 
     def grabfunc(self, data):
-        if data.action == ob.KeyAction.Release:
-            # have all the modifiers this started with been released?
-            if not self.state & data.state:
-                self.cycling = 0
-                focus._disable = 0
-                self.activatetarget(1) # activate, and deiconify/unshade/raise
-                self.destroypopup()
-                ob.kungrab()
-                ob.mungrab()
+        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?
+        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
+            # activate, and deiconify/unshade/raise
+            self.activatetarget(notreverting)
+            self.destroypopup()
+            ob.kungrab()
+            ob.mungrab()
 
 def _newwindow(data):
     if _o.cycling: _o.populatelist()
@@ -209,4 +243,6 @@ def _grabfunc(data):
 ob.ebind(ob.EventAction.NewWindow, _newwindow)
 ob.ebind(ob.EventAction.CloseWindow, _closewindow)
 
-_o = cycledata()
+_o = _cycledata()
+
+print "Loaded stackedcycle.py"