twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-03 05:31:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use io instead of liftIO in Prompt

Browse Source
This commit is contained in:
Adam Vogt
2009-11-15 02:53:01 +00:00
parent ff11ae70a0
commit aa6f4882a4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
XMonad/Prompt.hs
View File

@@ -270,23 +270,23 @@ mkXPromptWithReturn t conf compl action = do
let d = display c let d = display c
rw = theRoot c rw = theRoot c
s <- gets $ screenRect . W.screenDetail . W.current . windowset s <- gets $ screenRect . W.screenDetail . W.current . windowset
hist <- liftIO readHistory hist <- io readHistory
w <- liftIO $ createWin d rw conf s w <- io $ createWin d rw conf s
liftIO $ selectInput d w $ exposureMask .|. keyPressMask io $ selectInput d w $ exposureMask .|. keyPressMask
gc <- liftIO $ createGC d w gc <- io $ createGC d w
liftIO $ setGraphicsExposures d gc False io $ setGraphicsExposures d gc False
fs <- initXMF (font conf) fs <- initXMF (font conf)
numlock <- asks $ X.numlockMask . X.config numlock <- asks $ X.numlockMask . X.config
let hs = fromMaybe [] $ M.lookup (showXPrompt t) hist let hs = fromMaybe [] $ M.lookup (showXPrompt t) hist
st = (initState d rw w s compl gc fs (XPT t) hs conf) st = (initState d rw w s compl gc fs (XPT t) hs conf)
{ numlockMask = numlock } { numlockMask = numlock }
st' <- liftIO $ execStateT runXP st st' <- io $ execStateT runXP st
releaseXMF fs releaseXMF fs
liftIO $ freeGC d gc io $ freeGC d gc
if successful st' if successful st'
then do then do
liftIO $ writeHistory $ M.insertWith io $ writeHistory $ M.insertWith
(\xs ys -> take (historySize conf) (\xs ys -> take (historySize conf)
. historyFilter conf $ xs ++ ys) . historyFilter conf $ xs ++ ys)
(showXPrompt t) (historyFilter conf [command st']) (showXPrompt t) (historyFilter conf [command st'])