defn vars at the top of funcs

[chaz/openbox] / scripts / focusmodel.py

diff --git a/scripts/focusmodel.py b/scripts/focusmodel.py
index a52fb39b59d7417ab4d89b3fb419f5741327d950..a0b6c927d134565a52df1d30ca49758d75015445 100644 (file)
--- a/scripts/focusmodel.py
+++ b/scripts/focusmodel.py
@@ -17,7 +17,10 @@ def setup_click_focus(click_raise = 1):
              ob.MouseAction.Press, callbacks.focus)
     ob.mbind("Left", ob.MouseContext.Window,
              ob.MouseAction.Press, callbacks.focus)
-    #ob.mbind("A-Left", ob.MouseContext.Frame, ob.MouseAction.Press, focus)
+    ob.mbind("Middle", ob.MouseContext.Window,
+             ob.MouseAction.Press, callbacks.focus)
+    ob.mbind("A-Left", ob.MouseContext.Frame,
+             ob.MouseAction.Press, callbacks.focus)
     if click_raise:
         ob.mbind("Left", ob.MouseContext.Titlebar,
                  ob.MouseAction.Press, callbacks.raise_win)
@@ -35,6 +38,24 @@ def setup_sloppy_focus(click_focus = 1, click_raise = 0):
        in a window can raise the window to the front of its stacking layer."""
     ob.ebind(ob.EventAction.EnterWindow, callbacks.focus)
     if click_focus:
-        setup_click_focus(click_raise)
+        ob.mbind("Left", ob.MouseContext.Titlebar,
+                 ob.MouseAction.Press, callbacks.focus)
+        ob.mbind("Left", ob.MouseContext.Handle,
+                 ob.MouseAction.Press, callbacks.focus)
+        ob.mbind("Left", ob.MouseContext.Grip,
+                 ob.MouseAction.Press, callbacks.focus)
+        ob.mbind("Left", ob.MouseContext.Window,
+                 ob.MouseAction.Press, callbacks.focus)
+        if click_raise:
+            ob.mbind("Left", ob.MouseContext.Titlebar,
+                     ob.MouseAction.Press, callbacks.raise_win)
+            ob.mbind("Left", ob.MouseContext.Handle,
+                     ob.MouseAction.Press, callbacks.raise_win)
+            ob.mbind("Left", ob.MouseContext.Grip,
+                     ob.MouseAction.Press, callbacks.raise_win)
+            ob.mbind("Left", ob.MouseContext.Window,
+                     ob.MouseAction.Press, callbacks.raise_win)    
+
+export_functions = setup_click_focus, setup_sloppy_focus
 
 print "Loaded focusmodel.py"