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

clean up some weird formatting/overboard strictness annotations

Browse Source
This commit is contained in:
Don Stewart 2007-11-05 01:14:00 +00:00
parent d1c29a40cf
commit 934fb2c368
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
XMonad.hs
View File

@ -62,19 +62,21 @@ data XConf = XConf
} }
-- todo, better name -- todo, better name
data XConfig = XConfig { normalBorderColor :: !String data XConfig = XConfig
, focusedBorderColor :: !String { normalBorderColor :: !String
, terminal :: !String , focusedBorderColor :: !String
, layoutHook :: !(Layout Window) , terminal :: !String
, manageHook :: !(Window -> String -> String -> String -> X (WindowSet -> WindowSet)) , layoutHook :: !(Layout Window)
, workspaces :: ![String] , manageHook :: Window -> String -> String -> String -> X (WindowSet -> WindowSet)
, defaultGaps :: ![(Int,Int,Int,Int)] , workspaces :: [String]
, numlockMask :: !KeyMask , defaultGaps :: [(Int,Int,Int,Int)]
, modMask :: !KeyMask , numlockMask :: !KeyMask
, keys :: !(XConfig -> M.Map (ButtonMask,KeySym) (X ())) , modMask :: !KeyMask
, mouseBindings :: !(XConfig -> M.Map (ButtonMask, Button) (Window -> X ())) , keys :: XConfig -> M.Map (ButtonMask,KeySym) (X ())
, borderWidth :: !Dimension , mouseBindings :: XConfig -> M.Map (ButtonMask, Button) (Window -> X ())
, logHook :: !(X ()) } , borderWidth :: !Dimension
, logHook :: X ()
}
type WindowSet = StackSet WorkspaceId (Layout Window) Window ScreenId ScreenDetail type WindowSet = StackSet WorkspaceId (Layout Window) Window ScreenId ScreenDetail
type WindowSpace = Workspace WorkspaceId (Layout Window) Window type WindowSpace = Workspace WorkspaceId (Layout Window) Window
@ -113,8 +115,7 @@ catchX :: X a -> X a -> X a
catchX job errcase = do catchX job errcase = do
st <- get st <- get
c <- ask c <- ask
(a, s') <- io $ runX c st job `catch` (a, s') <- io $ runX c st job `catch` \e -> case e of
\e -> case e of
ExitException {} -> throw e ExitException {} -> throw e
_ -> do hPrint stderr e; runX c st errcase _ -> do hPrint stderr e; runX c st errcase
put s' put s'