fix \'s

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 9b909d01aefe8c35b5c1a9a5f3ff98f588bd5697..b7b48c1ca9ccab0e8b4bd17f18ccc3e72045f031 100644 (file)
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -86,9 +86,9 @@ def resize(data):
                        data.press_clientwidth + dx,
                        data.press_clientheight + dy);
 
-def restart(data):
-    """Restarts openbox"""
-    openbox.restart("")
+def restart(data, other = ""):
+    """Restarts openbox, optionally starting another window manager."""
+    openbox.restart(other)
 
 def raise_win(data):
     """Raises the window on which the event occured"""
@@ -269,6 +269,38 @@ def setup_scroll():
     mbind("C-A-4", MC_Frame, MouseClick, send_to_next_desktop)
     mbind("C-A-5", MC_Frame, MouseClick, send_to_prev_desktop)
 
+def setup_fallback_focus():
+    """Sets up a focus fallback routine so that when no windows are focused,
+       the last window to have focus on the desktop will be focused."""
+    focus_stack = []
+    def focused(data):
+        #global focus_stack
+        if data.client:
+            window = data.client.window()
+            # add to front the stack
+            if window in focus_stack:
+                focus_stack.remove(window)
+            focus_stack.insert(0, window)
+        else:
+            # pass around focus
+            desktop = openbox.screen(data.screen).desktop()
+            l = len(focus_stack)
+            i = 0
+            while i < l:
+                w = focus_stack[i]
+                client = openbox.findClient(w)
+                if not client: # window is gone, remove it
+                    focus_stack.pop(i)
+                    l = l - 1
+                elif client.desktop() == desktop and \
+                         client.normal() and client.focus():
+                    break
+                else:
+                    i = i + 1
+
+    ebind(EventFocus, focused)
+
+    
 ############################################################################
 ### Window placement algorithms, choose one of these and ebind it to the ###
 ### EventPlaceWindow action.                                             ###