X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fstackedcycle.py;h=59dbc98e421265c961d79e453bac88e937083fa5;hb=ef231de58a738c83bf505e184fbafa9077f7452e;hp=4c549d66045c4b6c7bcbe6de7a2271ab4684fc40;hpb=106883eedf32ac44afb8ca93c7004a523d493d2f;p=chaz%2Fopenbox diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py index 4c549d66..59dbc98e 100644 --- a/scripts/stackedcycle.py +++ b/scripts/stackedcycle.py @@ -4,24 +4,25 @@ ########################################################################### ### Options that affect the behavior of the stackedcycle module. ### -### Also see the options in the focus module. ### ########################################################################### -include_all_desktops = 0 +INCLUDE_ALL_DESKTOPS = 0 """If this is non-zero then windows from all desktops will be included in the stacking list.""" -include_icons = 1 +INCLUDE_ICONS = 1 """If this is non-zero then windows which are iconified will be included in the stacking list.""" -include_omnipresent = 1 +INCLUDE_OMNIPRESENT = 1 """If this is non-zero then windows which are on all-desktops at once will be included.""" -title_size_limit = 80 +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 +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): @@ -48,16 +49,15 @@ def previous(data): import otk import ob import focus +import focuscycle -class cycledata: +class _cycledata: def __init__(self): self.cycling = 0 def createpopup(self): - self.style = self.screen.style() - self.widget = otk.Widget(ob.openbox, self.style, otk.Widget.Vertical, - 0, self.style.bevelWidth(), 1) - self.widget.setTexture(self.style.titlebarFocusBackground()) + self.widget = otk.Widget(self.screen.number(), ob.openbox, + otk.Widget.Vertical, 0, 1) def destroypopup(self): self.menuwidgets = [] @@ -70,11 +70,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 @@ -91,16 +91,14 @@ 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 - height = font.height() - # make the widgets i = 0 self.menuwidgets = [] @@ -111,21 +109,17 @@ class cycledata: self.clients.pop(i) continue - w = otk.FocusLabel(self.widget) + w = otk.Label(self.widget) if current and c.window() == current.window(): self.menupos = i - w.focus() - else: - w.unfocus() + w.setHighlighted(1) self.menuwidgets.append(w) 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:] - length = font.measureString(t) - if length > longest: longest = length + 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:] w.setText(t) i += 1 @@ -138,18 +132,20 @@ class cycledata: else: self.menupos = oldpos - # fit to the largest item in the menu + # find the size for the popup + width = 0 + height = 0 for w in self.menuwidgets: - w.fitSize(longest, height) - + size = w.minSize() + if size.width() > width: width = size.width() + height += size.height() + # show or hide the list and its child widgets if len(self.clients) > 1: - area = self.screeninfo.rect() - self.widget.update() - self.widget.move(area.x() + (area.width() - - self.widget.width()) / 2, - area.y() + (area.height() - - self.widget.height()) / 2) + size = self.screeninfo.size() + self.widget.moveresize(otk.Rect((size.width() - width) / 2, + (size.height() - height) / 2, + width, height)) self.widget.show(1) def activatetarget(self, final): @@ -161,19 +157,25 @@ 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): if not self.cycling: + ob.kgrab(data.screen, _grabfunc) + # the pointer grab causes pointer events during the keyboard grab + # to go away, which means we don't get enter notifies when the + # popup disappears, screwing up the focus + ob.mgrab(data.screen) + self.cycling = 1 focus._disable = 1 self.state = data.state @@ -184,13 +186,9 @@ class cycledata: self.clients = [] # so it doesnt try start partway through the list self.populatelist() - ob.kgrab(self.screen.number(), _grabfunc) - # the pointer grab causes pointer events during the keyboard grab - # to go away, which means we don't get enter notifies when the - # popup disappears, screwing up the focus - ob.mgrab(self.screen.number()) - - self.menuwidgets[self.menupos].unfocus() + if not len(self.clients): return # don't both doing anything + + self.menuwidgets[self.menupos].setHighlighted(0) if forward: self.menupos += 1 else: @@ -198,26 +196,29 @@ class cycledata: # wrap around 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: + self.menuwidgets[self.menupos].setHighlighted(1) + if ACTIVATE_WHILE_CYCLING: self.activatetarget(0) # activate, but dont deiconify/unshade/raise 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() @@ -234,4 +235,6 @@ def _grabfunc(data): ob.ebind(ob.EventAction.NewWindow, _newwindow) ob.ebind(ob.EventAction.CloseWindow, _closewindow) -_o = cycledata() +_o = _cycledata() + +print "Loaded stackedcycle.py"