From 970ea52bb7d2379390b3acdb03a8e2fa2e923ccb Mon Sep 17 00:00:00 2001
From: David Roundy <droundy@darcs.net>
Date: Sun, 11 Nov 2007 01:56:29 +0100
Subject: changes to work with XConfig of kind * -> *.

darcs-hash:20071111005629-72aca-19e9e88bd2c31a9d5a3bbccbb9a569a8cd8fd2bc.gz
---
 XMonad/Config/Arossato.hs  | 6 +++---
 XMonad/Config/Droundy.hs   | 8 ++++----
 XMonad/Config/Sjanssen.hs  | 4 ++--
 XMonad/Hooks/DynamicLog.hs | 5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'XMonad')

diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs
index 5885734..ccb0096 100644
--- a/XMonad/Config/Arossato.hs
+++ b/XMonad/Config/Arossato.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonad.Config.Arossato
@@ -52,7 +53,7 @@ myTabConfig = defaultTConf {
 -- 
 -- Key bindings:
 -- I want to remove some of the default key bindings, such as those to exit XMonad
-defaultKeys :: XConfig -> M.Map (KeyMask, KeySym) (X ())
+defaultKeys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())
 defaultKeys x = M.fromList $
     -- launching and killing programs
     [ ((modMask x .|. shiftMask, xK_Return), spawn "xterm") -- %! Launch an xterm
@@ -105,7 +106,7 @@ defaultKeys x = M.fromList $
     ++ mykeys x
 
 -- These are my personal key bindings
-mykeys :: XConfig -> [((KeyMask, KeySym), (X ()))]
+mykeys :: XConfig Layout -> [((KeyMask, KeySym), (X ()))]
 mykeys x = 
     [ ((modMask x                 , xK_F12   ), xmonadPrompt myXPConfig               )
     , ((modMask x                 , xK_F3    ), shellPrompt  myXPConfig               )
@@ -126,7 +127,6 @@ mykeys x =
     ]
 
 
-arossatoConfig :: XConfig
 arossatoConfig = defaultConfig
          { borderWidth        = 1
          , workspaces         = map show [1 .. 9 :: Int]
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
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs
index 1e50df5..40aab8b 100644
--- a/XMonad/Config/Sjanssen.hs
+++ b/XMonad/Config/Sjanssen.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 module XMonad.Config.Sjanssen (sjanssenConfig) where
 
 import XMonad
@@ -17,7 +18,6 @@ import qualified Data.Map as M
 import Graphics.X11
 import System.IO (hPutStrLn)
 
-sjanssenConfig :: IO XConfig
 sjanssenConfig = do
     xmobar <- spawnPipe "xmobar"
     return $ defaultConfig
@@ -31,7 +31,7 @@ sjanssenConfig = do
                 , ((modm, button2), (\w -> focus w >> windows W.swapMaster))
                 , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
         , keys = \c -> mykeys c `M.union` keys defaultConfig c
-        , layoutHook = Layout (smartBorders (tiled ||| Mirror tiled ||| Full ||| tabbed shrinkText defaultTConf))
+        , layoutHook = smartBorders (tiled ||| Mirror tiled ||| Full ||| tabbed shrinkText defaultTConf)
         }
  where
     tiled   = Tall 1 0.03 0.5
diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs
index 8993f4f..66c897f 100644
--- a/XMonad/Hooks/DynamicLog.hs
+++ b/XMonad/Hooks/DynamicLog.hs
@@ -40,6 +40,7 @@ module XMonad.Hooks.DynamicLog (
 -- Useful imports
 --
 import XMonad
+import XMonad.Layouts
 import Control.Monad.Reader
 import Data.Maybe ( isJust )
 import Data.List
@@ -63,7 +64,7 @@ import XMonad.Util.Run
 
 -- | An example xmonad config that spawns a new dzen toolbar and uses the default
 -- dynamic log output
-makeSimpleDzenConfig :: IO XConfig
+makeSimpleDzenConfig :: IO (XConfig (Choose Tall (Choose (Mirror Tall) Full)))
 makeSimpleDzenConfig = do
   h <- spawnPipe "dzen2"
   return defaultConfig
@@ -81,7 +82,7 @@ makeSimpleDzenConfig = do
 -- The intent is that the avove config file should provide a nice status
 -- bar with minimal effort.
 --
-dzen :: (XConfig -> IO ()) -> IO ()
+dzen :: (XConfig (Choose Tall (Choose (Mirror Tall) Full)) -> IO ()) -> IO ()
 dzen f = do
   h <- spawnPipe ("dzen2" ++ " " ++ flags)
   f $ defaultConfig
-- 
cgit v1.2.3