build with optimisations on as usual, fix a few compile errors

This commit is contained in:
Don Stewart 2007-11-05 02:48:58 +00:00
parent ee5ae195e0
commit 080e11b376
3 changed files with 17 additions and 11 deletions

View File

@ -1,6 +1,5 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : DefaultConfig.hs
-- Copyright : (c) Spencer Janssen 2007 -- Copyright : (c) Spencer Janssen 2007
-- License : BSD3-style (see LICENSE) -- License : BSD3-style (see LICENSE)
-- --
@ -14,14 +13,18 @@
-- --
------------------------------------------------------------------------ ------------------------------------------------------------------------
module Main (main) where module XMonad.Config.Droundy where
-- --
-- Useful imports -- Useful imports
-- --
import Control.Monad.Reader ( asks ) import Control.Monad.Reader ( asks )
import XMonad hiding (workspaces, manageHook, numlockMask)
import qualified XMonad (workspaces, manageHook, numlockMask) import XMonad hiding
(workspaces,manageHook,numlockMask,keys,mouseBindings)
import qualified XMonad
(workspaces,manageHook,numlockMask,keys,mouseBindings)
import XMonad.Layouts hiding ( (|||) ) import XMonad.Layouts hiding ( (|||) )
import XMonad.Operations import XMonad.Operations
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
@ -29,7 +32,7 @@ import Data.Bits ((.|.))
import qualified Data.Map as M import qualified Data.Map as M
import System.Exit import System.Exit
import Graphics.X11.Xlib import Graphics.X11.Xlib
import XMonad.EventLoop import XMonad.Core
-- % Extension-provided imports -- % Extension-provided imports
@ -293,8 +296,8 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
, normalBorderColor = "#dddddd" -- Border color for unfocused windows. , normalBorderColor = "#dddddd" -- Border color for unfocused windows.
, focusedBorderColor = "#00ff00" -- Border color for focused windows. , focusedBorderColor = "#00ff00" -- Border color for focused windows.
, XMonad.numlockMask = numlockMask , XMonad.numlockMask = numlockMask
, XMonad.keys = Main.keys , XMonad.keys = keys
, XMonad.mouseBindings = Main.mouseBindings , XMonad.mouseBindings = mouseBindings
-- | Perform an arbitrary action on each internal state change or X event. -- | Perform an arbitrary action on each internal state change or X event.
-- Examples include: -- Examples include:
-- * do nothing -- * do nothing
@ -305,5 +308,5 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
, XMonad.manageHook = manageHook , XMonad.manageHook = manageHook
} }
main :: IO () -- main :: IO ()
main = makeMain defaultConfig -- main = makeMain defaultConfig

View File

@ -5,7 +5,7 @@ import qualified XMonad.StackSet as W
import XMonad.Layouts import XMonad.Layouts
import XMonad.Layout.Tabbed import XMonad.Layout.Tabbed
import XMonad.Operations import XMonad.Operations
import XMonad.DefaultConfig (defaultConfig) import XMonad.Config (defaultConfig)
import XMonad.Layout.NoBorders import XMonad.Layout.NoBorders
import XMonad.Hooks.DynamicLog import XMonad.Hooks.DynamicLog
import XMonad.Prompt import XMonad.Prompt

View File

@ -10,11 +10,12 @@ license-file: LICENSE
author: Spencer Janssen author: Spencer Janssen
maintainer: sjanssen@cse.unl.edu maintainer: sjanssen@cse.unl.edu
build-depends: base>=2.0, mtl, unix, X11==1.3.0, xmonad==0.4 build-depends: base>=2.0, mtl, unix, X11==1.3.0, xmonad==0.4
ghc-options: -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
ghc-prof-options: -prof -auto-all
extra-source-files: README scripts/generate-configs scripts/run-xmonad.sh extra-source-files: README scripts/generate-configs scripts/run-xmonad.sh
scripts/xinitrc scripts/xmonad-acpi.c scripts/xinitrc scripts/xmonad-acpi.c
scripts/xmonad-clock.c tests/test_SwapWorkspaces.hs scripts/xmonad-clock.c tests/test_SwapWorkspaces.hs
tests/tests_XPrompt.hs tests/tests_XPrompt.hs
configs/droundy.hs
exposed-modules: XMonad.Actions.Commands exposed-modules: XMonad.Actions.Commands
XMonad.Actions.ConstrainedResize XMonad.Actions.ConstrainedResize
XMonad.Actions.CopyWindow XMonad.Actions.CopyWindow
@ -39,6 +40,8 @@ exposed-modules: XMonad.Actions.Commands
XMonad.Actions.WindowBringer XMonad.Actions.WindowBringer
XMonad.Actions.WmiiActions XMonad.Actions.WmiiActions
XMonad.Config.Sjanssen XMonad.Config.Sjanssen
XMonad.Config.Dons
-- XMonad.Config.Droundy
XMonad.Hooks.DynamicLog XMonad.Hooks.DynamicLog
-- XMonad.Hooks.ManageDocks -- XMonad.Hooks.ManageDocks
XMonad.Hooks.SetWMName XMonad.Hooks.SetWMName