X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fstackedcycle.py;h=76658ae1fe9384ea6623a2a290e31c831fc017b6;hb=dca8c61a91cab29128a72f252b70f4bd9f7786ff;hp=9c60c1b9c66a25a9c7ccc5f3c0f5d13ee40a9e91;hpb=220b5c40f91c6509951ccd0d506a9bd77d9d6bac;p=chaz%2Fopenbox diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py index 9c60c1b9..76658ae1 100644 --- a/scripts/stackedcycle.py +++ b/scripts/stackedcycle.py @@ -9,8 +9,11 @@ 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.""" +"""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.""" @@ -56,10 +59,8 @@ class _cycledata: 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 = [] @@ -74,7 +75,11 @@ class _cycledata: 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 @@ -96,17 +101,11 @@ class _cycledata: # get the list of clients, keeping iconic windows at the bottom self.clients = [] iconic_clients = [] - for i in focus._clients: - c = ob.openbox.findClient(i) - if c: - if c.iconic(): iconic_clients.append(c) - else: self.clients.append(c) + 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 = [] @@ -117,21 +116,23 @@ 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 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:] - length = font.measureString(t) - if length > longest: longest = length w.setText(t) i += 1 @@ -144,18 +145,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): @@ -167,7 +170,7 @@ 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 @@ -175,13 +178,20 @@ class _cycledata: 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) + if not final: + focus._skip += 1 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 self.screen = ob.openbox.screen(data.screen) self.screeninfo = otk.display.screenInfo(data.screen) @@ -190,15 +200,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()) - if not len(self.clients): return # don't both doing anything - self.menuwidgets[self.menupos].unfocus() + self.menuwidgets[self.menupos].setHighlighted(0) if forward: self.menupos += 1 else: @@ -206,7 +210,7 @@ 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() + self.menuwidgets[self.menupos].setHighlighted(1) if ACTIVATE_WHILE_CYCLING: self.activatetarget(0) # activate, but dont deiconify/unshade/raise @@ -214,22 +218,24 @@ class _cycledata: 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): + if 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 + 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()