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

Merge branch 'AusCyberman/master'

Browse Source 
Closes: https://github.com/xmonad/xmonad-contrib/pull/569
This commit is contained in:
Tomas Janousek 2021-07-13 10:43:10 +01:00
commit 5d0a3de24d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -189,7 +189,8 @@
* `XMonad.Hooks.DynamicIcons` * `XMonad.Hooks.DynamicIcons`
Added Dynamic Strings as `dynamicLogIconWithPP` based on a Workspaces Windows Dynamically augment workspace names logged to a status bar via DynamicLog
based on the contents (windows) of the workspace.
* `XMonad.Hooks.WindowSwallowing` * `XMonad.Hooks.WindowSwallowing`

25
XMonad/Hooks/DynamicIcons.hs
View File

@ -24,6 +24,7 @@ module XMonad.Hooks.DynamicIcons (
dynamicIconsPP, getWorkspaceIcons, dynamicIconsPP, getWorkspaceIcons,
IconConfig(..), IconConfig(..),
iconsFmtAppend, iconsFmtReplace, wrapUnwords, iconsFmtAppend, iconsFmtReplace, wrapUnwords,
iconsGetAll, iconsGetFocus,
) where ) where
import XMonad import XMonad
@ -31,8 +32,8 @@ import XMonad
import qualified XMonad.StackSet as S import qualified XMonad.StackSet as S
import qualified Data.Map as M import qualified Data.Map as M
import XMonad.Hooks.DynamicLog import XMonad.Hooks.StatusBar.PP
import XMonad.Prelude (for, (<&>), (<=<), (>=>)) import XMonad.Prelude (for, maybeToList, (<&>), (<=<), (>=>))
-- $usage -- $usage
-- Dynamically augment Workspace's 'WorkspaceId' as shown on a status bar -- Dynamically augment Workspace's 'WorkspaceId' as shown on a status bar
@ -95,29 +96,31 @@ dynamicIconsPP ic pp = getWorkspaceIcons ic <&> \ren -> pp{ ppRename = ppRename
-- | Returns a function for 'ppRename' that augments workspaces with icons -- | Returns a function for 'ppRename' that augments workspaces with icons
-- according to the provided 'IconConfig'. -- according to the provided 'IconConfig'.
getWorkspaceIcons :: IconConfig -> X (String -> WindowSpace -> String) getWorkspaceIcons :: IconConfig -> X (String -> WindowSpace -> String)
getWorkspaceIcons IconConfig{..} = fmt <$> getWorkspaceIcons' iconConfigIcons getWorkspaceIcons conf@IconConfig{..} = fmt <$> getWorkspaceIcons' conf
where where
fmt icons s w = iconConfigFmt s (M.findWithDefault [] (S.tag w) icons) fmt icons s w = iconConfigFmt s (M.findWithDefault [] (S.tag w) icons)
getWorkspaceIcons' :: Query [String] -> X (M.Map WorkspaceId [String]) getWorkspaceIcons' :: IconConfig -> X (M.Map WorkspaceId [String])
getWorkspaceIcons' q = do getWorkspaceIcons' IconConfig{..} = do
ws <- gets (S.workspaces . windowset) ws <- gets (S.workspaces . windowset)
is <- for ws $ foldMap (runQuery q) . S.integrate' . S.stack is <- for ws $ foldMap (runQuery iconConfigIcons) <=< iconConfigFilter . S.stack
pure $ M.fromList (zip (map S.tag ws) is) pure $ M.fromList (zip (map S.tag ws) is)
-- | Datatype for expanded 'Icon' configurations -- | Datatype for expanded 'Icon' configurations
data IconConfig = IconConfig data IconConfig = IconConfig
{ iconConfigIcons :: Query [String] { iconConfigIcons :: Query [String]
-- ^ What icons to use for each window. -- ^ What icons to use for each window.
, iconConfigFmt :: WorkspaceId -> [String] -> String , iconConfigFmt :: WorkspaceId -> [String] -> String
-- ^ How to format the result, see 'iconsFmtReplace', 'iconsFmtAppend'. -- ^ How to format the result, see 'iconsFmtReplace', 'iconsFmtAppend'.
, iconConfigFilter :: Maybe (S.Stack Window) -> X [Window]
-- ^ Which windows (icons) to show.
} }
instance Default IconConfig where instance Default IconConfig where
def = IconConfig def = IconConfig
{ iconConfigIcons = mempty { iconConfigIcons = mempty
, iconConfigFmt = iconsFmtReplace (wrapUnwords "{" "}") , iconConfigFmt = iconsFmtReplace (wrapUnwords "{" "}")
, iconConfigFilter = iconsGetAll
} }
-- | 'iconConfigFmt' that replaces the workspace name with icons, if any. -- | 'iconConfigFmt' that replaces the workspace name with icons, if any.
@ -171,3 +174,11 @@ iconsFmtAppend cat ws is | null is = ws
wrapUnwords :: String -> String -> [String] -> String wrapUnwords :: String -> String -> [String] -> String
wrapUnwords _ _ [x] = x wrapUnwords _ _ [x] = x
wrapUnwords l r xs = wrap l r (unwords xs) wrapUnwords l r xs = wrap l r (unwords xs)
-- | 'iconConfigFilter' that shows all windows of every workspace.
iconsGetAll :: Maybe (S.Stack Window) -> X [Window]
iconsGetAll = pure . S.integrate'
-- | 'iconConfigFilter' that shows only the focused window for each workspace.
iconsGetFocus :: Maybe (S.Stack Window) -> X [Window]
iconsGetFocus = pure . maybeToList . fmap S.focus