diff options
| author | David Roundy <droundy@darcs.net> | 2007-10-18 19:00:58 +0200 |
|---|---|---|
| committer | David Roundy <droundy@darcs.net> | 2007-10-18 19:00:58 +0200 |
| commit | 741821c57d74740cf03a1a84318dfb7dd5d2718c (patch) | |
| tree | 46a155080d2fc52006b2f90860d98a91d6344f28 | |
| parent | 21ef4511bb9e1d951a518f36e7c41c0f48fbed4c (diff) | |
| download | xmonad-741821c57d74740cf03a1a84318dfb7dd5d2718c.tar.gz xmonad-741821c57d74740cf03a1a84318dfb7dd5d2718c.tar.xz xmonad-741821c57d74740cf03a1a84318dfb7dd5d2718c.zip | |
make xmonad work with inverted main/config.
darcs-hash:20071018170058-72aca-8018fed9e1c0bc2cf40664b766bb85f678a6a258.gz
| -rw-r--r-- | EventLoop.hs | 2 | ||||
| -rw-r--r-- | Main.hs (renamed from config.hs) | 3 | ||||
| -rw-r--r-- | Main.hs-boot (renamed from Config.hs-boot) | 2 | ||||
| -rw-r--r-- | Operations.hs | 3 | ||||
| -rw-r--r-- | xmonad.cabal | 2 |
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 "" @@ -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 |