X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Ffocus.py;h=0dfd3fb8142d1f9d5749c7ed096fac6a6fcecafb;hb=109c58966796c4b2bd1b1f4a58a4efc7d79350e5;hp=5e7c0d28dbdf900b65053c70b11654c915167562;hpb=cb5eb0d560759cebce3279cb28d942166e0e9a7a;p=chaz%2Fopenbox

diff --git a/scripts/focus.py b/scripts/focus.py
index 5e7c0d28..0dfd3fb8 100644
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -24,11 +24,12 @@ import ob
 
 # maintain a list of clients, stacked in focus order
 _clients = []
-_disable = 0
+_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()
@@ -47,22 +48,32 @@ def _remove(client):
     raise ValueError("_remove(x): x not in _clients list.")
 
 def _focused(data):
-    global _clients
+    global _clients, _skip
 
-    if _disable: return
+    if _skip:
+        _skip -= 1
+        return
 
     if data.client:
         # move it to the top
-        _remove(data.client)
+        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) and c.focus():
+            if _focusable(c, desktop):
+                c.focus()
                 break
 
 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
     _clients.append(data.client)
         
 def _closewindow(data):