twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-11 18:22:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prompt.Window: remove unneeded and ugly escaping/unescaping

Browse Source
This commit is contained in:
Andrea Rossato
2008-02-16 13:38:42 +00:00
parent f611982205
commit 4def39f610
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
XMonad/Prompt/Window.hs
View File

@@ -50,8 +50,10 @@ import XMonad.Actions.WindowBringer
data WindowPrompt = Goto | Bring data WindowPrompt = Goto | Bring
instance XPrompt WindowPrompt where instance XPrompt WindowPrompt where
showXPrompt Goto = "Go to window: " showXPrompt Goto = "Go to window: "
showXPrompt Bring = "Bring me here: " showXPrompt Bring = "Bring me here: "
commandToComplete _ c = c
nextCompletion _ = getNextCompletion
windowPromptGoto, windowPromptBring :: XPConfig -> X () windowPromptGoto, windowPromptBring :: XPConfig -> X ()
windowPromptGoto c = doPrompt Goto c windowPromptGoto c = doPrompt Goto c
@@ -69,17 +71,9 @@ doPrompt t c = do
where where
winAction a m = flip whenJust (windows . a) . flip M.lookup m . unescape winAction a m = flip whenJust (windows . a) . flip M.lookup m
gotoAction = winAction W.greedyView gotoAction = winAction W.greedyView
bringAction = winAction bringWindow bringAction = winAction bringWindow
bringWindow w ws = W.shiftWin (W.tag . W.workspace . W.current $ ws) w ws bringWindow w ws = W.shiftWin (W.tag . W.workspace . W.current $ ws) w ws
compList m s = return . filter (isPrefixOf s) . map (escape . fst) . M.toList $ m compList m s = return . filter (isPrefixOf s) . map fst . M.toList $ m
escape [] = []
escape (' ':xs) = "\\ " ++ escape xs
escape (x :xs) = x : escape xs
unescape [] = []
unescape ('\\':' ':xs) = ' ' : unescape xs
unescape (x:xs) = x : unescape xs