X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=scripts%2Ffocus.py;h=970300131051137b1690c0d01bf58c0ee629dfa2;hb=8a05ae261d640df3844fdae942556793c62bd073;hp=4c3e5a136db98d8afd25665d27f9a20ec3298d89;hpb=ff98438acca3ae7ca0b2be66cb39cc29643ecaba;p=chaz%2Fopenbox

diff --git a/scripts/focus.py b/scripts/focus.py
index 4c3e5a13..97030013 100644
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -2,91 +2,68 @@
 ###          Functions for helping out with your window focus.          ###
 ###########################################################################
 
-ob_focus_raise = 1
-ob_focus_fallback = 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."""
+###########################################################################
+
+###########################################################################
+###########################################################################
+
+###########################################################################
+###      Internal stuff, should not be accessed outside the module.     ###
+###########################################################################
+
+import ob
 
 # maintain a list of clients, stacked in focus order
-ob_clients = []
-# maintaint he current focused window
-ob_focused = 0;
+_clients = []
+_disable = 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 _focusable(client, desktop):
+    if not client.normal(): return 0
+    if not (client.canFocus() or client.focusNotify()): return 0
+    if avoid_skip_taskbar and client.skipTaskbar(): return 0
 
-def ob_close_win(data):
-    global ob_clients
-    ob_clients.remove(data.client.window())
+    desk = client.desktop()
+    if not (desk == 0xffffffff or desk == desktop): return 0
 
-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)
-    elif ob_focus_fallback:
-        # 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
+    return 1
 
-ebind(EventNewWindow, ob_new_win)
-ebind(EventCloseWindow, ob_close_win)
-ebind(EventFocus, ob_focused)
+def _focused(data):
+    global _clients
 
-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 _disable: 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
+        win = data.client.window()
+        # move it to the top
+        _clients.remove(win)
+        _clients.insert(0, win)
+    elif fallback:
+        # pass around focus
+        desktop = ob.openbox.screen(data.screen).desktop()
+        for w in _clients:
+            client = ob.openbox.findClient(w)
+            if client and _focusable(client, desktop) and client.focus():
                 break
-            elif screen.client(i).window() == client_win:
-                found = 1
-        if not found: # 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)
-            return
-        if forward:
-            t += num
-            if t >= count: t -= count
-        else:
-            t -= 1
-            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)
+def _newwindow(data):
+    _clients.append(data.client.window())
+        
+def _closewindow(data):
+    try:
+        _clients.remove(data.client.window())
+    except ValueError: pass
 
+ob.ebind(ob.EventAction.NewWindow, _newwindow)
+ob.ebind(ob.EventAction.CloseWindow, _closewindow)
+ob.ebind(ob.EventAction.Focus, _focused)
 
 print "Loaded focus.py"