"""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."""
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
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:]
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:
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)
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":
+ if not self.state & data.state:
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:
- self.cycling = 0
- focus._disable = 0
# activate, and deiconify/unshade/raise
self.activatetarget(notreverting)
self.destroypopup()
+ self.cycling = 0
ob.kungrab()
ob.mungrab()