diff options
| author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-09-21 00:14:55 +0200 |
|---|---|---|
| committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-09-21 00:14:55 +0200 |
| commit | b03f8e33706718b1f3c4bda8dc4a058911645557 (patch) | |
| tree | 5c5e380ab8d6fff80292c41356f9d618a3ef9f25 /XMonad/Prompt.hs | |
| parent | 3d51959bb8c9fdec07258ae6fa5a6db938ff771a (diff) | |
| download | XMonadContrib-b03f8e33706718b1f3c4bda8dc4a058911645557.tar.gz XMonadContrib-b03f8e33706718b1f3c4bda8dc4a058911645557.tar.xz XMonadContrib-b03f8e33706718b1f3c4bda8dc4a058911645557.zip | |
Only use search history for completion in X.A.Search
Ignore-this: 807fcd4fa14a25ecc9787940f9950736
darcs-hash:20090920221455-7f603-eca315cbb45fe6bc4f34e45a7f9a00f6770119e4.gz
Diffstat (limited to '')
| -rw-r--r-- | XMonad/Prompt.hs | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 8e6f97a..07f80c0 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -54,6 +54,7 @@ module XMonad.Prompt , decodeInput , encodeOutput , historyCompletion + , historyCompletionP -- * History filters , deleteAllDuplicates , deleteConsecutive @@ -127,15 +128,15 @@ data XPConfig = , height :: !Dimension -- ^ Window height , historySize :: !Int -- ^ The number of history entries to be saved , historyFilter :: [String] -> [String] - -- ^ a filter to determine which - -- history entries to remember + -- ^ a filter to determine which + -- history entries to remember , promptKeymap :: M.Map (KeyMask,KeySym) (XP ()) - , completionKey :: KeySym -- ^ Key that should trigger completion - -- ^ Mapping from key combinations to actions + -- ^ Mapping from key combinations to actions + , completionKey :: KeySym -- ^ Key that should trigger completion , defaultText :: String -- ^ The text by default in the prompt line , autoComplete :: Maybe Int -- ^ Just x: if only one completion remains, auto-select it, , showCompletionOnTab :: Bool -- ^ Only show list of completions when Tab was pressed - -- and delay by x microseconds + -- and delay by x microseconds } data XPType = forall p . XPrompt p => XPT p @@ -277,7 +278,11 @@ mkXPromptWithReturn t conf compl action = do liftIO $ writeHistory $ M.insertWith (\xs ys -> take (historySize conf) . historyFilter conf $ xs ++ ys) - (showXPrompt t) [command st'] hist + (showXPrompt t) (historyFilter conf [command st']) + hist + -- we need to apply historyFilter before as well, since + -- otherwise the filter would not be applied if + -- there is no history Just <$> action (command st') else return Nothing @@ -862,7 +867,13 @@ breakAtSpace s -- 'getShellCompl'; you pass it to mkXPrompt, and it will make completions work -- from the query history stored in ~\/.xmonad\/history. historyCompletion :: ComplFunction -historyCompletion x = fmap (deleteConsecutive . filter (isInfixOf x) . M.fold (++) []) readHistory +historyCompletion = historyCompletionP (const True) + +-- | Like 'historyCompletion' but only uses history data from Prompts whose +-- name satisfies the given predicate. +historyCompletionP :: (String -> Bool) -> ComplFunction +historyCompletionP p x = fmap (toComplList . M.filterWithKey (const . p)) readHistory + where toComplList = deleteConsecutive . filter (isInfixOf x) . M.fold (++) [] -- | Sort a list and remove duplicates. Like 'deleteAllDuplicates', but trades off -- laziness and stability for efficiency. |