diff options
author | David Roundy <droundy@darcs.net> | 2007-06-12 17:42:53 +0200 |
---|---|---|
committer | David Roundy <droundy@darcs.net> | 2007-06-12 17:42:53 +0200 |
commit | 0244bff4b032f2e16b52fa1c745e0119d0dde2d2 (patch) | |
tree | 1be49bf57f39c52af50a1c14eedcf9a467b005e7 /XMonad.hs | |
parent | f4f0f537620208cddb90eb3f72efd15f7d9b6768 (diff) | |
download | xmonad-0244bff4b032f2e16b52fa1c745e0119d0dde2d2.tar.gz xmonad-0244bff4b032f2e16b52fa1c745e0119d0dde2d2.tar.xz xmonad-0244bff4b032f2e16b52fa1c745e0119d0dde2d2.zip |
add catchX to catch exceptions.
darcs-hash:20070612154253-72aca-b2c7e24b5e70a09feaebccd443aebbe37b568efa.gz
Diffstat (limited to '')
-rw-r--r-- | XMonad.hs | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -17,7 +17,7 @@ module XMonad ( X, WindowSet, WorkspaceId(..), ScreenId(..), XState(..), XConf(..), Layout(..), Typeable, Message, SomeMessage(..), fromMessage, runLayout, - runX, io, catchIO, withDisplay, withWindowSet, isRoot, spawn, restart, trace, whenJust, whenX, + runX, catchX, io, catchIO, withDisplay, withWindowSet, isRoot, spawn, restart, trace, whenJust, whenX, atom_WM_STATE, atom_WM_PROTOCOLS, atom_WM_DELETE_WINDOW ) where @@ -76,6 +76,17 @@ newtype X a = X (ReaderT XConf (StateT XState IO) a) runX :: XConf -> XState -> X a -> IO () runX c st (X a) = runStateT (runReaderT a c) st >> return () +-- | Run in the X monad, and in case of exception, and catch it and log it +-- to stderr, and run the error case. +catchX :: X a -> X a -> X a +catchX (X job) (X errcase) = + do st <- get + c <- ask + (a,s') <- io ((runStateT (runReaderT job c) st) `catch` + \e -> (do hPutStrLn stderr (show e); runStateT (runReaderT errcase c) st)) + put s' + return a + -- --------------------------------------------------------------------- -- Convenient wrappers to state |