grab early in the cycle so that we dont miss the modifier release

[chaz/openbox] / scripts / stackedcycle.py

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index fc086aad788c7deaa077bb3846f08add29d9f639..43507de389575e4181cc2255efb67723de67a604 100644 (file)
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -112,10 +112,10 @@ class _cycledata:
             w = otk.Label(self.widget)
             if current and c.window() == current.window():
                 self.menupos = i
-                #w.focus() XXX
+                w.setHighlighted(1)
                 pass
             else:
-                #w.unfocus() XXX
+                w.setHighlighted(0)
                 pass
             self.menuwidgets.append(w)
 
@@ -174,6 +174,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 +190,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 +200,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