summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-11-04 03:03:20 +0100
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-11-04 03:03:20 +0100
commit8aafa0c870bbfafb56ecdb8b7c423e9ee95a6c3c (patch)
tree474e8e2ae465c441e1661df9c457c6c39dcefa97
parent160a33532745ead1aa485cff0f13e7e055ebb482 (diff)
downloadmetatile-8aafa0c870bbfafb56ecdb8b7c423e9ee95a6c3c.tar
metatile-8aafa0c870bbfafb56ecdb8b7c423e9ee95a6c3c.zip
Use the layout and workspaces values from the actual configuration used
darcs-hash:20071104020320-a5988-9f9b76e313f4de76c45434e828938eae6b83a8fe
-rw-r--r--XMonad/DefaultConfig.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/XMonad/DefaultConfig.hs b/XMonad/DefaultConfig.hs
index bd41696..49f28cf 100644
--- a/XMonad/DefaultConfig.hs
+++ b/XMonad/DefaultConfig.hs
@@ -162,7 +162,7 @@ keys conf@(XConfig {modMask = modMask}) = M.fromList $
, ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window
, ((modMask, xK_space ), sendMessage NextLayout) -- %! Rotate through the available layout algorithms
- , ((modMask .|. shiftMask, xK_space ), setLayout $ Layout layout) -- %! Reset the layouts on the current workspace to default
+ , ((modMask .|. shiftMask, xK_space ), setLayout $ layoutHook conf) -- %! Reset the layouts on the current workspace to default
, ((modMask, xK_n ), refresh) -- %! Resize viewed windows to the correct size
@@ -201,7 +201,7 @@ keys conf@(XConfig {modMask = modMask}) = M.fromList $
-- mod-[1..9] %! Switch to workspace N
-- mod-shift-[1..9] %! Move client to workspace N
[((m .|. modMask, k), windows $ f i)
- | (i, k) <- zip workspaces [xK_1 .. xK_9]
+ | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
, (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
++
-- mod-{w,e,r} %! Switch to physical/Xinerama screens 1, 2, or 3