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

diff --git a/scripts/defaults.py b/scripts/defaults.py
index 184da763..459c0d61 100644
--- a/scripts/defaults.py
+++ b/scripts/defaults.py
@@ -1,3 +1,4 @@
+import ob         # base module
 import focus      # add some default focus handling and cycling functions
 import focusmodel # default focus models
 import behavior   # defines default behaviors for interaction with windows
@@ -12,7 +13,7 @@ focus.FALLBACK = 1
 focusmodel.setup_click_focus() # use focusmodel.setup_sloppy_focus() instead to
                                # make focus follow the cursor, or bind things
                                # in some way like these functions do to make
-                               # your own custom 'focus model'.
+                               # your own custom focus model.
 # set up the mouse buttons
 behavior.setup_window_clicks()
 behavior.setup_window_buttons()
@@ -34,17 +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
-import stackedcycle # functions for doing stacked 'kde-style' cycling
-ob.kbind(["A-Tab"], ob.KeyContext.All, stackedcycle.next)
-ob.kbind(["A-S-Tab"], ob.KeyContext.All, stackedcycle.previous
 
-# if you want linear cycling instead of stacked cycling, comment out the focus
+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.
-#import focuscycle # functions for doing linear cycling
-#focuscycle.RAISE_WINDOW = 0 # don't raise windows when they're activated
-#ob.kbind(["A-Tab"], ob.KeyContext.All, focuscycle.next)
-#ob.kbind(["A-S-Tab"], ob.KeyContext.All, focuscycle.previous)
+#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))
@@ -52,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))