diff options
| author | David Roundy <droundy@darcs.net> | 2007-11-11 01:56:29 +0100 |
|---|---|---|
| committer | David Roundy <droundy@darcs.net> | 2007-11-11 01:56:29 +0100 |
| commit | 970ea52bb7d2379390b3acdb03a8e2fa2e923ccb (patch) | |
| tree | 004bac35e23c75ad0e5bdff4b0f65a1c076644c4 /XMonad/Config/Droundy.hs | |
| parent | 3e6325d478daa289c2247cc317f1e9ac87fbc7aa (diff) | |
| download | XMonadContrib-970ea52bb7d2379390b3acdb03a8e2fa2e923ccb.tar.gz XMonadContrib-970ea52bb7d2379390b3acdb03a8e2fa2e923ccb.tar.xz XMonadContrib-970ea52bb7d2379390b3acdb03a8e2fa2e923ccb.zip | |
changes to work with XConfig of kind * -> *.
darcs-hash:20071111005629-72aca-19e9e88bd2c31a9d5a3bbccbb9a569a8cd8fd2bc.gz
Diffstat (limited to 'XMonad/Config/Droundy.hs')
| -rw-r--r-- | XMonad/Config/Droundy.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index 8004a9d..8e9f3c1 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -1,3 +1,4 @@ +{-# OPTIONS_GHC -fno-warn-missing-signatures #-} ----------------------------------------------------------------------------- -- | -- Copyright : (c) Spencer Janssen 2007 @@ -63,7 +64,7 @@ myXPConfig = defaultXPConfig {font="-*-lucida-medium-r-*-*-14-*-*-*-*-*-*-*" -- -- (The comment formatting character is used when generating the manpage) -- -keys :: XConfig -> M.Map (KeyMask, KeySym) (X ()) +keys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ()) keys x = M.fromList $ -- launching and killing programs [ ((modMask x .|. shiftMask, xK_c ), kill1) -- %! Close the focused window @@ -125,7 +126,7 @@ keys x = M.fromList $ -- | Mouse bindings: default actions bound to mouse events -- -mouseBindings :: XConfig -> M.Map (KeyMask, Button) (Window -> X ()) +mouseBindings :: XConfig Layout -> M.Map (KeyMask, Button) (Window -> X ()) mouseBindings x = M.fromList $ -- mod-button1 %! Set the window to floating mode and move by dragging [ ((modMask x, button1), (\w -> focus w >> mouseMoveWindow w)) @@ -136,11 +137,10 @@ mouseBindings x = M.fromList $ -- you may also bind events to the mouse scroll wheel (button4 and button5) ] -config :: XConfig config = defaultConfig { borderWidth = 1 -- Width of the window border in pixels. , XMonad.workspaces = ["1:mutt","2:iceweasel"] - , layoutHook = Layout $ workspaceDir "~" $ windowNavigation $ toggleLayouts (noBorders Full) $ + , layoutHook = workspaceDir "~" $ windowNavigation $ toggleLayouts (noBorders Full) $ Named "tabbed" (noBorders mytab) ||| Named "xclock" (mytab <-/> combineTwo Square mytab mytab) ||| mytab <//> mytab |