twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.A.DynamicWorkspaces: Honor searchPredicate in withWorkspace

Browse Source 
If the user's prompt configuration has a custom `searchPredicate` (e.g.,
`X.P.FuzzyMatch.fuzzyMatch`) the `withWorkspace` prompt should make use
of it (instead of defaulting to an `isPrefixOf`-style matching).  For
details see

    https://mail.haskell.org/pipermail/xmonad/2021-December/015491.html
This commit is contained in:
ramon diaz-uriarte (at Phelsuma) 2021-12-28 04:29:42 +01:00 committed by slotThe
parent 4d387bbfc9
commit 540635fe1c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -850,6 +850,9 @@
- Fixed a system freeze when using `X.A.CopyWindow.copy` in - Fixed a system freeze when using `X.A.CopyWindow.copy` in
combination with `removeWorkspace`. combination with `removeWorkspace`.
- `withWorkspace` now honors the users `searchPredicate`, for
example `fuzzyMatch` from `Prompt.FuzzyMatch`.
## 0.16 ## 0.16
### Breaking Changes ### Breaking Changes

8
XMonad/Actions/DynamicWorkspaces.hs
View File

@ -38,7 +38,7 @@ import XMonad.Prelude (find, isNothing, nub, when)
import XMonad hiding (workspaces) import XMonad hiding (workspaces)
import XMonad.StackSet hiding (filter, modify, delete) import XMonad.StackSet hiding (filter, modify, delete)
import XMonad.Prompt.Workspace ( Wor(Wor), workspacePrompt ) import XMonad.Prompt.Workspace ( Wor(Wor), workspacePrompt )
import XMonad.Prompt ( XPConfig, mkXPrompt ) import XMonad.Prompt ( XPConfig, mkComplFunFromList', mkXPrompt )
import XMonad.Util.WorkspaceCompare ( getSortByIndex ) import XMonad.Util.WorkspaceCompare ( getSortByIndex )
import qualified Data.Map.Strict as Map import qualified Data.Map.Strict as Map
import qualified XMonad.Util.ExtensibleState as XS import qualified XMonad.Util.ExtensibleState as XS
@ -107,17 +107,13 @@ withWorkspaceIndex job widx = do
ilookup :: WorkspaceIndex -> X (Maybe WorkspaceTag) ilookup :: WorkspaceIndex -> X (Maybe WorkspaceTag)
ilookup idx = Map.lookup idx <$> XS.gets workspaceIndexMap ilookup idx = Map.lookup idx <$> XS.gets workspaceIndexMap
mkCompl :: [String] -> String -> IO [String]
mkCompl l s = return $ filter (\x -> take (length s) x == s) l
withWorkspace :: XPConfig -> (String -> X ()) -> X () withWorkspace :: XPConfig -> (String -> X ()) -> X ()
withWorkspace c job = do ws <- gets (workspaces . windowset) withWorkspace c job = do ws <- gets (workspaces . windowset)
sort <- getSortByIndex sort <- getSortByIndex
let ts = map tag $ sort ws let ts = map tag $ sort ws
job' t | t `elem` ts = job t job' t | t `elem` ts = job t
| otherwise = addHiddenWorkspace t >> job t | otherwise = addHiddenWorkspace t >> job t
mkXPrompt (Wor "") c (mkCompl ts) job' mkXPrompt (Wor "") c (mkComplFunFromList' c ts) job'
renameWorkspace :: XPConfig -> X () renameWorkspace :: XPConfig -> X ()
renameWorkspace conf = workspacePrompt conf renameWorkspaceByName renameWorkspace conf = workspacePrompt conf renameWorkspaceByName