From a0b42ff9d7120d6ae202365ada3893be6480144c Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Sun, 15 Nov 2009 03:53:01 +0100 Subject: Use io instead of liftIO in Prompt Ignore-this: cd4031b74cd5bb874cd2c3cc2cb087f2 darcs-hash:20091115025301-1499c-992bfa7612baa7b5c6c992208b12eb2e06df50d9.gz --- XMonad/Prompt.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'XMonad/Prompt.hs') diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index a84decc..17a628d 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -269,24 +269,24 @@ mkXPromptWithReturn t conf compl action = do c <- ask let d = display c rw = theRoot c - s <- gets $ screenRect . W.screenDetail . W.current . windowset - hist <- liftIO readHistory - w <- liftIO $ createWin d rw conf s - liftIO $ selectInput d w $ exposureMask .|. keyPressMask - gc <- liftIO $ createGC d w - liftIO $ setGraphicsExposures d gc False + s <- gets $ screenRect . W.screenDetail . W.current . windowset + hist <- io readHistory + w <- io $ createWin d rw conf s + io $ selectInput d w $ exposureMask .|. keyPressMask + gc <- io $ createGC d w + io $ setGraphicsExposures d gc False fs <- initXMF (font conf) numlock <- asks $ X.numlockMask . X.config let hs = fromMaybe [] $ M.lookup (showXPrompt t) hist st = (initState d rw w s compl gc fs (XPT t) hs conf) { numlockMask = numlock } - st' <- liftIO $ execStateT runXP st + st' <- io $ execStateT runXP st releaseXMF fs - liftIO $ freeGC d gc + io $ freeGC d gc if successful st' then do - liftIO $ writeHistory $ M.insertWith + io $ writeHistory $ M.insertWith (\xs ys -> take (historySize conf) . historyFilter conf $ xs ++ ys) (showXPrompt t) (historyFilter conf [command st']) -- cgit v1.2.3