X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fdefaults.py;h=459c0d6159720f62dcb840ca277e6f877541621f;hb=5d62948cc5ace4dfa4c2543a53e9f7f7d9a86fff;hp=7fd2273d77b80ee084a2aa7138b9605e505bdac5;hpb=51a41b9b765dbcf76ec09324f533d8c8edd46e37;p=chaz%2Fopenbox

diff --git a/scripts/defaults.py b/scripts/defaults.py
index 7fd2273d..459c0d61 100644
--- a/scripts/defaults.py
+++ b/scripts/defaults.py
@@ -1,5 +1,5 @@
+import ob         # base module
 import focus      # add some default focus handling and cycling functions
-import stackedcycle # functions for doing stacked 'kde-style' cycling
 import focusmodel # default focus models
 import behavior   # defines default behaviors for interaction with windows
 import callbacks  # a lib of functions that can be used as binding callbacks
@@ -7,11 +7,13 @@ import windowplacement # use a routine in here to place windows
 import historyplacement # history window placement
 
 # try focus something when nothing is focused
-focus.fallback = 1
+focus.FALLBACK = 1
 
 # choose a default focus model
 focusmodel.setup_click_focus() # use focusmodel.setup_sloppy_focus() instead to
-                               # make focus follow the cursor
+                               # make focus follow the cursor, or bind things
+                               # in some way like these functions do to make
+                               # your own custom focus model.
 # set up the mouse buttons
 behavior.setup_window_clicks()
 behavior.setup_window_buttons()
@@ -24,7 +26,7 @@ ob.ebind(ob.EventAction.PlaceWindow, historyplacement.place)
 def histplace(data):
     if data.client.appClass() == "XTerm": return 0
     return 1
-historyplacement.confirm_callback = histplace
+historyplacement.CONFIRM_CALLBACK = histplace
 
 
 # run xterm from root clicks
@@ -33,9 +35,23 @@ ob.mbind("Left", ob.MouseContext.Root, ob.MouseAction.Click,
 
 ob.kbind(["A-F4"], ob.KeyContext.All, callbacks.close)
 
+ob.kbind(["W-d"], ob.KeyContext.All, callbacks.toggle_show_desktop)
+
 # focus bindings
-ob.kbind(["A-Tab"], ob.KeyContext.All, stackedcycle.next)
-ob.kbind(["A-S-Tab"], ob.KeyContext.All, stackedcycle.previous)
+
+from cycle import CycleWindows
+ob.kbind(["A-Tab"], ob.KeyContext.All, CycleWindows.next)
+ob.kbind(["A-S-Tab"], ob.KeyContext.All, CycleWindows.previous)
+
+# if you want linear cycling instead of stacked cycling, comment out the two
+# bindings above, and use these instead.
+#from cycle import CycleWindowsLinear
+#ob.kbind(["A-Tab"], ob.KeyContext.All, CycleWindows.next)
+#ob.kbind(["A-S-Tab"], ob.KeyContext.All, CycleWindows.previous)
+
+from cycle import CycleDesktops
+ob.kbind(["C-Tab"], ob.KeyContext.All, CycleDesktops.next)
+ob.kbind(["C-S-Tab"], ob.KeyContext.All, CycleDesktops.previous)
 
 # desktop changing bindings
 ob.kbind(["C-1"], ob.KeyContext.All, lambda(d): callbacks.change_desktop(d, 0))
@@ -43,9 +59,13 @@ ob.kbind(["C-2"], ob.KeyContext.All, lambda(d): callbacks.change_desktop(d, 1))
 ob.kbind(["C-3"], ob.KeyContext.All, lambda(d): callbacks.change_desktop(d, 2))
 ob.kbind(["C-4"], ob.KeyContext.All, lambda(d): callbacks.change_desktop(d, 3))
 ob.kbind(["C-A-Right"], ob.KeyContext.All,
-         lambda(d): callbacks.next_desktop(d))
+         lambda(d): callbacks.right_desktop(d))
 ob.kbind(["C-A-Left"], ob.KeyContext.All,
-         lambda(d): callbacks.prev_desktop(d))
+         lambda(d): callbacks.left_desktop(d))
+ob.kbind(["C-A-Up"], ob.KeyContext.All,
+         lambda(d): callbacks.up_desktop(d))
+ob.kbind(["C-A-Down"], ob.KeyContext.All,
+         lambda(d): callbacks.down_desktop(d))
 
 ob.kbind(["C-S-A-Right"], ob.KeyContext.All,
          lambda(d): callbacks.send_to_next_desktop(d))