From 140ea83e4922055317ab64d0a968f89efc5e3cc4 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Sun, 15 Nov 2009 03:56:47 +0100 Subject: Use less short names in X.Prompt Ignore-this: 1d27b8efc4d829a5642717c6f6426336 darcs-hash:20091115025647-1499c-f326242916f623c9685e2ecc1bc2ea7ab600ebfd.gz --- XMonad/Prompt.hs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'XMonad/Prompt.hs') diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 17a628d..74b7730 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -266,9 +266,7 @@ getInput = gets command -- module. mkXPromptWithReturn :: XPrompt p => p -> XPConfig -> ComplFunction -> (String -> X a) -> X (Maybe a) mkXPromptWithReturn t conf compl action = do - c <- ask - let d = display c - rw = theRoot c + XConf { display = d, theRoot = rw } <- ask s <- gets $ screenRect . W.screenDetail . W.current . windowset hist <- io readHistory w <- io $ createWin d rw conf s @@ -313,8 +311,7 @@ mkXPrompt t conf compl action = mkXPromptWithReturn t conf compl action >> retur runXP :: XP () runXP = do - st <- get - let (d,w) = (dpy &&& win) st + (d,w) <- gets (dpy &&& win) status <- io $ grabKeyboard d w True grabModeAsync grabModeAsync currentTime when (status == grabSuccess) $ do updateWindows -- cgit v1.2.3