From 25b84d6386701c79e6fb389c1d0ce843a48f0243 Mon Sep 17 00:00:00 2001 From: Devin Mullins Date: Mon, 11 Aug 2008 05:31:37 +0200 Subject: simplify WindowBringer code, and change greedyView to focusWindow darcs-hash:20080811033137-78224-6fb0ea21833cf4400fce90981b07826d26162451.gz --- XMonad/Prompt/Window.hs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'XMonad/Prompt') diff --git a/XMonad/Prompt/Window.hs b/XMonad/Prompt/Window.hs index 65d4009..c45417e 100644 --- a/XMonad/Prompt/Window.hs +++ b/XMonad/Prompt/Window.hs @@ -73,16 +73,14 @@ windowPromptBring c = doPrompt Bring c doPrompt :: WindowPrompt -> XPConfig -> X () doPrompt t c = do a <- case t of - Goto -> return . gotoAction =<< windowMapWith (W.tag . fst) - Bring -> return . bringAction =<< windowMapWith snd - wm <- windowMapWith id + Goto -> fmap gotoAction windowMap + Bring -> fmap bringAction windowMap + wm <- windowMap mkXPrompt t c (compList wm) a where - winAction a m = flip whenJust (windows . a) . flip M.lookup m - gotoAction = winAction W.greedyView + gotoAction = winAction W.focusWindow bringAction = winAction bringWindow - bringWindow w ws = W.shiftWin (W.tag . W.workspace . W.current $ ws) w ws compList m s = return . filter (isPrefixOf s) . map fst . M.toList $ m -- cgit v1.2.3