diff options
| -rw-r--r-- | EventLoop.hs | 1 | ||||
| -rw-r--r-- | Main.hs | 4 | ||||
| -rw-r--r-- | XMonad.hs | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/EventLoop.hs b/EventLoop.hs index 719edb0..b01036a 100644 --- a/EventLoop.hs +++ b/EventLoop.hs @@ -68,7 +68,6 @@ makeMain xmc = do cf = XConf { display = dpy , config = xmc - , terminal = defaultTerminal xmc , theRoot = rootw , normalBorder = nbc , focusedBorder = fbc } @@ -157,7 +157,7 @@ layout = tiled ||| Mirror tiled ||| Full keys :: M.Map (KeyMask, KeySym) (X ()) keys = M.fromList $ -- 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 .|. shiftMask, xK_p ), spawn "gmrun") -- %! Launch gmrun , ((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. -- , layoutHook = layout - , defaultTerminal = "xterm" -- The preferred terminal program. + , terminal = "xterm" -- The preferred terminal program. , normalBorderColor = "#dddddd" -- Border color for unfocused windows. , focusedBorderColor = "#ff0000" -- Border color for focused windows. , XMonad.keys = Main.keys @@ -50,7 +50,6 @@ data XState = XState data XConf = XConf { display :: Display -- ^ the X11 display , config :: !XConfig -- ^ initial user configuration - , terminal :: !String -- ^ the user's preferred terminal , theRoot :: !Window -- ^ the root window , normalBorder :: !Pixel -- ^ border color of unfocused windows , 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)) => XConfig { normalBorderColor :: !String , focusedBorderColor :: !String - , defaultTerminal :: !String + , terminal :: !String , layoutHook :: !(l Window) , workspaces :: ![String] , defaultGaps :: ![(Int,Int,Int,Int)] |