mirror of
https://github.com/xmonad/xmonad-contrib.git
synced 2025-05-19 03:20:21 -07:00
28b3e34fd7
Prompts based on `mkComplFunList` and `mkComplFunList'` were not taking into account the `searchPredicate` funtion from `XPConfig`. This was rather confusing. We fix it by passing `XPConfig` to these functions; although this is strictly more than they need, it makes the breaking change very easy to fix and is also more future-proof.
56 lines
1.6 KiB
Haskell
56 lines
1.6 KiB
Haskell
-----------------------------------------------------------------------------
|
|
-- |
|
|
-- Module : XMonad.Prompt.XMonad
|
|
-- Copyright : (C) 2007 Andrea Rossato
|
|
-- License : BSD3
|
|
--
|
|
-- Maintainer : andrea.rossato@unibz.it
|
|
-- Stability : unstable
|
|
-- Portability : unportable
|
|
--
|
|
-- A prompt for running XMonad commands
|
|
--
|
|
-----------------------------------------------------------------------------
|
|
|
|
module XMonad.Prompt.XMonad (
|
|
-- * Usage
|
|
-- $usage
|
|
xmonadPrompt,
|
|
xmonadPromptC,
|
|
XMonad,
|
|
) where
|
|
|
|
import XMonad
|
|
import XMonad.Prompt
|
|
import XMonad.Actions.Commands (defaultCommands)
|
|
import Data.Maybe (fromMaybe)
|
|
|
|
-- $usage
|
|
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
|
|
--
|
|
-- > import XMonad.Prompt
|
|
-- > import XMonad.Prompt.XMonad
|
|
--
|
|
-- in your keybindings add:
|
|
--
|
|
-- > , ((modm .|. controlMask, xK_x), xmonadPrompt def)
|
|
--
|
|
-- For detailed instruction on editing the key binding see
|
|
-- "XMonad.Doc.Extending#Editing_key_bindings".
|
|
|
|
data XMonad = XMonad
|
|
|
|
instance XPrompt XMonad where
|
|
showXPrompt XMonad = "XMonad: "
|
|
|
|
xmonadPrompt :: XPConfig -> X ()
|
|
xmonadPrompt c = do
|
|
cmds <- defaultCommands
|
|
xmonadPromptC cmds c
|
|
|
|
-- | An xmonad prompt with a custom command list
|
|
xmonadPromptC :: [(String, X ())] -> XPConfig -> X ()
|
|
xmonadPromptC commands c =
|
|
mkXPrompt XMonad c (mkComplFunFromList' c (map fst commands)) $
|
|
fromMaybe (return ()) . (`lookup` commands)
|