make xmonad work with inverted main/config.

darcs-hash:20071018170058-72aca-8018fed9e1c0bc2cf40664b766bb85f678a6a258

5 files changed, 7 insertions, 5 deletions

diff --git a/EventLoop.hs b/EventLoop.hs
index 6490031..c6658db 100644
--- a/EventLoop.hs
+++ b/EventLoop.hs
@@ -39,7 +39,7 @@ import System.IO
 --
 makeMain :: String -> String -> Layout Window -> [String] -> [(Int,Int,Int,Int)]
          -> M.Map (ButtonMask,KeySym) (X ()) -> M.Map (ButtonMask, Button) (Window -> X ())
-         -> Int -> X () -> IO ()
+         -> Dimension -> X () -> IO ()
 makeMain normalBorderColor focusedBorderColor layoutHook workspaces
          defaultGaps keys mouseBindings borderWidth logHook = do
     dpy   <- openDisplay ""
diff --git a/config.hs b/Main.hs
index 37b0661..f3defcd 100644
--- a/config.hs
+++ b/Main.hs
@@ -14,7 +14,7 @@
 --
 ------------------------------------------------------------------------
 
-module Main ( main ) where
+module Main where
 
 --
 -- Useful imports
@@ -277,5 +277,6 @@ mouseBindings = M.fromList $
 
 -- % The main function
 
+main :: IO ()
 main = makeMain normalBorderColor focusedBorderColor layoutHook workspaces
                 defaultGaps keys mouseBindings borderWidth logHook
diff --git a/Config.hs-boot b/Main.hs-boot
index 00d45a7..046b627 100644
--- a/Config.hs-boot
+++ b/Main.hs-boot
@@ -1,4 +1,4 @@
-module Config where
+module Main where
 import Graphics.X11.Xlib.Types (Dimension)
 import Graphics.X11.Xlib (KeyMask,Window)
 import XMonad
diff --git a/Operations.hs b/Operations.hs
index 02fea77..4f5cd4b 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -20,7 +20,6 @@ module Operations where
 
 import XMonad
 import qualified StackSet as W
-import {-# SOURCE #-} Config (borderWidth,logHook,manageHook,numlockMask,serialisedLayouts)
 
 import Data.Maybe
 import Data.List            (nub, (\\), find, partition)
@@ -38,6 +37,8 @@ import Graphics.X11.Xlib
 import Graphics.X11.Xinerama (getScreenInfo)
 import Graphics.X11.Xlib.Extras
 
+import {-# SOURCE #-} Main (borderWidth,logHook,manageHook,numlockMask,serialisedLayouts)
+
 -- ---------------------------------------------------------------------
 -- |
 -- Window manager operations
diff --git a/xmonad.cabal b/xmonad.cabal
index e6c818e..05eaed2 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -22,7 +22,7 @@ extra-source-files: README TODO tests/loc.hs tests/Properties.hs man/xmonad.1.in
                     Config.hs-boot util/GenerateManpage.hs man/xmonad.1 man/xmonad.html
 
 executable:         xmonad
-main-is:            config.hs
+main-is:            Main.hs
 other-modules:      EventLoop Operations StackSet XMonad
 ghc-options:        -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
 ghc-prof-options:   -prof -auto-all