X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Ffocus.py;h=53abf190aaeac38147cbb40fe09a11c2238d0fb4;hb=91c7e5c378b1a639c6f5383915ed68b36b7735d4;hp=4c3e5a136db98d8afd25665d27f9a20ec3298d89;hpb=ff98438acca3ae7ca0b2be66cb39cc29643ecaba;p=chaz%2Fopenbox

diff --git a/scripts/focus.py b/scripts/focus.py
index 4c3e5a13..53abf190 100644
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -8,7 +8,8 @@ ob_focus_fallback = 0
 # maintain a list of clients, stacked in focus order
 ob_clients = []
 # maintaint he current focused window
-ob_focused = 0;
+ob_focused = 0
+ob_hold_client_list = 0
 
 def ob_new_win(data):
     global ob_clients
@@ -22,12 +23,14 @@ def ob_close_win(data):
 def ob_focused(data):
     global ob_clients
     if data.client:
-        win = data.client.window()
-        ob_focused = win
-        # move it to the top
-        ob_clients.remove(win)
-        ob_clients.insert(0, win)
+        if not ob_hold_client_list:
+            win = data.client.window()
+            ob_focused = win
+            # move it to the top
+            ob_clients.remove(win)
+            ob_clients.insert(0, win)
     elif ob_focus_fallback:
+        ob_old_client_list = 0 # something is wrong.. stop holding
         # pass around focus
         ob_focused = 0
         desktop = openbox.screen(data.screen).desktop()
@@ -41,6 +44,38 @@ ebind(EventNewWindow, ob_new_win)
 ebind(EventCloseWindow, ob_close_win)
 ebind(EventFocus, ob_focused)
 
+ob_cyc_mask = 0
+ob_cyc_key = 0;
+
+def focus_next_stacked_grab(data):
+    global ob_cyc_mask;
+    global ob_cyc_key;
+
+    if data.action == EventKeyRelease:
+        print "release: " + str(ob_cyc_mask) + "..." + str(data.state)
+        # have all the modifiers this started with been released?
+        if not ob_cyc_mask & data.state:
+            kungrab() # ungrab ourself
+            print "UNGRABBED!"
+    else:
+        print "press: " + str(ob_cyc_mask) + "..." + str(data.state) + \
+              "..." + data.key
+        if ob_cyc_key == data.key:
+            print "CYCLING!!"
+
+def focus_next_stacked(data, forward=1):
+    global ob_cyc_mask;
+    global ob_cyc_key;
+    ob_cyc_mask = data.state
+    ob_cyc_key = data.key
+
+    kgrab(focus_next_stacked_grab)
+    print "GRABBED!"
+    focus_next_stacked_grab(data) # start with the first press
+
+def focus_prev_stacked(data):
+    return
+
 def focus_next(data, num=1, forward=1):
     """Focus the next (or previous, with forward=0) window in a linear
        order."""
@@ -59,10 +94,11 @@ def focus_next(data, num=1, forward=1):
         for i in r:
             if found:
                 target = i
+                found = 2
                 break
             elif screen.client(i).window() == client_win:
                 found = 1
-        if not found: # wraparound
+        if found == 1: # wraparound
             if forward: target = 0
             else: target = count - 1
 
@@ -80,7 +116,7 @@ def focus_next(data, num=1, forward=1):
             t += num
             if t >= count: t -= count
         else:
-            t -= 1
+            t -= num
             if t < 0: t += count
         if t == target: return # nothing to focus