mirror of
https://github.com/xmonad/xmonad.git
synced 2025-05-19 08:30:21 -07:00
clean up some weird formatting/overboard strictness annotations
This commit is contained in:
parent
d1c29a40cf
commit
934fb2c368
19
XMonad.hs
19
XMonad.hs
@ -62,19 +62,21 @@ data XConf = XConf
|
||||
}
|
||||
|
||||
-- todo, better name
|
||||
data XConfig = XConfig { normalBorderColor :: !String
|
||||
data XConfig = XConfig
|
||||
{ normalBorderColor :: !String
|
||||
, focusedBorderColor :: !String
|
||||
, terminal :: !String
|
||||
, layoutHook :: !(Layout Window)
|
||||
, manageHook :: !(Window -> String -> String -> String -> X (WindowSet -> WindowSet))
|
||||
, workspaces :: ![String]
|
||||
, defaultGaps :: ![(Int,Int,Int,Int)]
|
||||
, manageHook :: Window -> String -> String -> String -> X (WindowSet -> WindowSet)
|
||||
, workspaces :: [String]
|
||||
, defaultGaps :: [(Int,Int,Int,Int)]
|
||||
, numlockMask :: !KeyMask
|
||||
, modMask :: !KeyMask
|
||||
, keys :: !(XConfig -> M.Map (ButtonMask,KeySym) (X ()))
|
||||
, mouseBindings :: !(XConfig -> M.Map (ButtonMask, Button) (Window -> X ()))
|
||||
, keys :: XConfig -> M.Map (ButtonMask,KeySym) (X ())
|
||||
, mouseBindings :: XConfig -> M.Map (ButtonMask, Button) (Window -> X ())
|
||||
, borderWidth :: !Dimension
|
||||
, logHook :: !(X ()) }
|
||||
, logHook :: X ()
|
||||
}
|
||||
|
||||
type WindowSet = StackSet WorkspaceId (Layout Window) Window ScreenId ScreenDetail
|
||||
type WindowSpace = Workspace WorkspaceId (Layout Window) Window
|
||||
@ -113,8 +115,7 @@ catchX :: X a -> X a -> X a
|
||||
catchX job errcase = do
|
||||
st <- get
|
||||
c <- ask
|
||||
(a, s') <- io $ runX c st job `catch`
|
||||
\e -> case e of
|
||||
(a, s') <- io $ runX c st job `catch` \e -> case e of
|
||||
ExitException {} -> throw e
|
||||
_ -> do hPrint stderr e; runX c st errcase
|
||||
put s'
|
||||
|
Loading…
x
Reference in New Issue
Block a user