twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-05-19 08:30:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate defaultTerminal

Browse Source
This commit is contained in:
Spencer Janssen 2007-11-01 07:31:47 +00:00
parent e50927ffc0
commit 8a8c538c23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
EventLoop.hs
View File

@ -68,7 +68,6 @@ makeMain xmc = do
cf = XConf cf = XConf
{ display = dpy { display = dpy
, config = xmc , config = xmc
, terminal = defaultTerminal xmc
, theRoot = rootw , theRoot = rootw
, normalBorder = nbc , normalBorder = nbc
, focusedBorder = fbc } , focusedBorder = fbc }

4
Main.hs
View File

@ -157,7 +157,7 @@ layout = tiled ||| Mirror tiled ||| Full
keys :: M.Map (KeyMask, KeySym) (X ()) keys :: M.Map (KeyMask, KeySym) (X ())
keys = M.fromList $ keys = M.fromList $
-- launching and killing programs -- launching and killing programs
[ ((modMask .|. shiftMask, xK_Return), asks terminal >>= spawn) -- %! Launch terminal [ ((modMask .|. shiftMask, xK_Return), asks (terminal . config) >>= spawn) -- %! Launch terminal
, ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- %! Launch dmenu , ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- %! Launch dmenu
, ((modMask .|. shiftMask, xK_p ), spawn "gmrun") -- %! Launch gmrun , ((modMask .|. shiftMask, xK_p ), spawn "gmrun") -- %! Launch gmrun
, ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window , ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window
@ -241,7 +241,7 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
-- transformers, for example, would be hooked in here. -- transformers, for example, would be hooked in here.
-- --
, layoutHook = layout , layoutHook = layout
, defaultTerminal = "xterm" -- The preferred terminal program. , terminal = "xterm" -- The preferred terminal program.
, normalBorderColor = "#dddddd" -- Border color for unfocused windows. , normalBorderColor = "#dddddd" -- Border color for unfocused windows.
, focusedBorderColor = "#ff0000" -- Border color for focused windows. , focusedBorderColor = "#ff0000" -- Border color for focused windows.
, XMonad.keys = Main.keys , XMonad.keys = Main.keys

3
XMonad.hs
View File

@ -50,7 +50,6 @@ data XState = XState
data XConf = XConf data XConf = XConf
{ display :: Display -- ^ the X11 display { display :: Display -- ^ the X11 display
, config :: !XConfig -- ^ initial user configuration , config :: !XConfig -- ^ initial user configuration
, terminal :: !String -- ^ the user's preferred terminal
, theRoot :: !Window -- ^ the root window , theRoot :: !Window -- ^ the root window
, normalBorder :: !Pixel -- ^ border color of unfocused windows , normalBorder :: !Pixel -- ^ border color of unfocused windows
, focusedBorder :: !Pixel } -- ^ border color of the focused window , focusedBorder :: !Pixel } -- ^ border color of the focused window
@ -59,7 +58,7 @@ data XConf = XConf
data XConfig = forall l. (LayoutClass l Window, Read (l Window)) => data XConfig = forall l. (LayoutClass l Window, Read (l Window)) =>
XConfig { normalBorderColor :: !String XConfig { normalBorderColor :: !String
, focusedBorderColor :: !String , focusedBorderColor :: !String
, defaultTerminal :: !String , terminal :: !String
, layoutHook :: !(l Window) , layoutHook :: !(l Window)
, workspaces :: ![String] , workspaces :: ![String]
, defaultGaps :: ![(Int,Int,Int,Int)] , defaultGaps :: ![(Int,Int,Int,Int)]