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

diff --git a/scripts/focus.py b/scripts/focus.py
index 53abf190..0dfd3fb8 100644
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -2,127 +2,85 @@
 ###          Functions for helping out with your window focus.          ###
 ###########################################################################
 
-ob_focus_raise = 1
-ob_focus_fallback = 0
-
-# maintain a list of clients, stacked in focus order
-ob_clients = []
-# maintaint he current focused window
-ob_focused = 0
-ob_hold_client_list = 0
-
-def ob_new_win(data):
-    global ob_clients
-    if not len(ob_clients): ob_clients.append(data.client.window())
-    else: ob_clients.insert(1, data.client.window()) # insert in 2nd slot
-
-def ob_close_win(data):
-    global ob_clients
-    ob_clients.remove(data.client.window())
-
-def ob_focused(data):
-    global ob_clients
-    if data.client:
-        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()
-        for w in ob_clients:
-            client = openbox.findClient(w)
-            if client and (client.desktop() == desktop and \
-                           client.normal() and client.focus()):
-                break
-
-ebind(EventNewWindow, ob_new_win)
-ebind(EventCloseWindow, ob_close_win)
-ebind(EventFocus, ob_focused)
-
-ob_cyc_mask = 0
-ob_cyc_key = 0;
+###########################################################################
+###         Options that affect the behavior of the focus module.       ###
+###########################################################################
+AVOID_SKIP_TASKBAR = 1
+"""Don't focus windows which have requested to not be displayed in taskbars.
+   You will still be able to focus the windows, but not through cycling, and
+   they won't be focused as a fallback if 'fallback' is enabled."""
+FALLBACK = 0
+"""Send focus somewhere when nothing is left with the focus, if possible."""
+###########################################################################
 
-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!!"
+###########################################################################
+###      Internal stuff, should not be accessed outside the module.     ###
+###########################################################################
 
-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
+import ob
 
-    kgrab(focus_next_stacked_grab)
-    print "GRABBED!"
-    focus_next_stacked_grab(data) # start with the first press
+# maintain a list of clients, stacked in focus order
+_clients = []
+_skip = 0
+
+def _focusable(client, desktop):
+    if not client.normal(): return 0
+    if not (client.canFocus() or client.focusNotify()): return 0
+    if client.iconic(): return 0
+    if AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
+
+    desk = client.desktop()
+    if not (desk == 0xffffffff or desk == desktop): return 0
+
+    return 1
+
+def _remove(client):
+    """This function exists because Swig pointers don't define a __eq__
+       function, so list.remove(ptr) does not work."""
+    win = client.window()
+    for i in range(len(_clients)):
+        if _clients[i].window() == win:
+            _clients.pop(i)
+            return
+    raise ValueError("_remove(x): x not in _clients list.")
 
-def focus_prev_stacked(data):
-    return
+def _focused(data):
+    global _clients, _skip
 
-def focus_next(data, num=1, forward=1):
-    """Focus the next (or previous, with forward=0) window in a linear
-       order."""
-    screen = openbox.screen(data.screen)
-    count = screen.clientCount()
+    if _skip:
+        _skip -= 1
+        return
 
-    if not count: return # no clients
-    
-    target = 0
     if data.client:
-        client_win = data.client.window()
-        found = 0
-        r = range(count)
-        if not forward:
-            r.reverse()
-        for i in r:
-            if found:
-                target = i
-                found = 2
+        # move it to the top
+        try:
+            _remove(data.client)
+        except ValueError: pass # happens if _focused comes before _newwindow
+        _clients.insert(0, data.client)
+    elif FALLBACK:
+        # pass around focus
+        desktop = ob.openbox.screen(data.screen).desktop()
+        for c in _clients:
+            if _focusable(c, desktop):
+                c.focus()
                 break
-            elif screen.client(i).window() == client_win:
-                found = 1
-        if found == 1: # wraparound
-            if forward: target = 0
-            else: target = count - 1
 
-    t = target
-    curdesk = screen.desktop()
-    while 1:
-        client = screen.client(t)
-        if client.normal() and \
-               (client.desktop() == curdesk or client.desktop() == 0xffffffff)\
-               and client.focus():
-            if ob_focus_raise:
-                screen.raiseWindow(client)
+def _newwindow(data):
+    # make sure its not already in the list
+    win = data.client.window()
+    for i in range(len(_clients)):
+        if _clients[i].window() == win:
             return
-        if forward:
-            t += num
-            if t >= count: t -= count
-        else:
-            t -= num
-            if t < 0: t += count
-        if t == target: return # nothing to focus
-
-def focus_prev(data, num=1):
-    """Focus the previous window in a linear order."""
-    focus_next(data, num, forward=0)
-
+    _clients.append(data.client)
+        
+def _closewindow(data):
+    _remove(data.client)
+
+ob.ebind(ob.EventAction.NewWindow, _newwindow)
+ob.ebind(ob.EventAction.CloseWindow, _closewindow)
+ob.ebind(ob.EventAction.Focus, _focused)
 
 print "Loaded focus.py"