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

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index fc086aad..59dbc98e 100644
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -112,11 +112,7 @@ class _cycledata:
             w = otk.Label(self.widget)
             if current and c.window() == current.window():
                 self.menupos = i
-                #w.focus() XXX
-                pass
-            else:
-                #w.unfocus() XXX
-                pass
+                w.setHighlighted(1)
             self.menuwidgets.append(w)
 
             if c.iconic(): t = c.iconTitle()
@@ -147,9 +143,9 @@ class _cycledata:
         # show or hide the list and its child widgets
         if len(self.clients) > 1:
             size = self.screeninfo.size()
-            self.widget.resize(otk.Size(width, height))
-            self.widget.move(otk.Point((size.width() - width) / 2,
-                                       (size.height() - height) / 2))
+            self.widget.moveresize(otk.Rect((size.width() - width) / 2,
+                                            (size.height() - height) / 2,
+                                            width, height))
             self.widget.show(1)
 
     def activatetarget(self, final):
@@ -174,6 +170,12 @@ class _cycledata:
 
     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,15 +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())
-
         if not len(self.clients): return # don't both doing anything
         
-        #self.menuwidgets[self.menupos].unfocus() XXX
+        self.menuwidgets[self.menupos].setHighlighted(0)
         if forward:
             self.menupos += 1
         else:
@@ -200,7 +196,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() XXX
+        self.menuwidgets[self.menupos].setHighlighted(1)
         if ACTIVATE_WHILE_CYCLING:
             self.activatetarget(0) # activate, but dont deiconify/unshade/raise