twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-01 20:51:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add missing ppVisibleNoWindows to workspaceNamesPP, marshallPP, clickableRenamedPP

Browse Source 
The ppVisibleNoWindows was added in #241 but none of the modules that
rename/mangle workspace names were updated (or didn't exist at the
time). This fixes this.

Related: https://github.com/xmonad/xmonad-contrib/pull/241
Related: 670eb3bc60 ("Added pretty printer for empty visible workspaces")
This commit is contained in:
Tomas Janousek
2021-02-03 15:48:02 +00:00
parent c6b4e69f39
commit c37737bf73
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
XMonad/Actions/WorkspaceNames.hs
View File

@@ -54,6 +54,7 @@ import XMonad.Prompt (mkXPrompt, XPConfig)
import XMonad.Prompt.Workspace (Wor(Wor))
import XMonad.Util.WorkspaceCompare (getSortByIndex)
import Data.Functor ((<&>))
import qualified Data.Map as M
import Data.Maybe (fromMaybe)
import Data.List (isInfixOf)
@@ -146,6 +147,7 @@ workspaceNamesPP pp = do
ppVisible = ppVisible pp . names,
ppHidden = ppHidden pp . names,
ppHiddenNoWindows = ppHiddenNoWindows pp . names,
ppVisibleNoWindows= ppVisibleNoWindows pp <&> (. names),
ppUrgent = ppUrgent pp . names
}

2
XMonad/Layout/IndependentScreens.hs
View File

@@ -31,6 +31,7 @@ module XMonad.Layout.IndependentScreens (
-- for the screen stuff
import Control.Applicative(liftA2)
import Control.Arrow hiding ((|||))
import Data.Functor ((<&>))
import Data.List (nub, genericLength)
import Graphics.X11.Xinerama
import XMonad
@@ -139,6 +140,7 @@ marshallPP s pp = pp {
ppVisible = ppVisible pp . snd . unmarshall,
ppHidden = ppHidden pp . snd . unmarshall,
ppHiddenNoWindows = ppHiddenNoWindows pp . snd . unmarshall,
ppVisibleNoWindows = ppVisibleNoWindows pp <&> (. snd . unmarshall),
ppUrgent = ppUrgent pp . snd . unmarshall,
ppSort = fmap (marshallSort s) (ppSort pp)
}

3
XMonad/Util/ClickableWorkspaces.hs
View File

@@ -27,6 +27,8 @@ module XMonad.Util.ClickableWorkspaces (
clickableMarshallWorkspaceNamesPP
) where
import Data.Functor ((<&>))
import XMonad
import XMonad.Actions.WorkspaceNames
import XMonad.Hooks.DynamicLog (xmobarAction, xmobarRaw, PP(..))
@@ -72,6 +74,7 @@ clickableRenamedPP ren pp = do
, ppVisible = ppVisible pp . clickable
, ppHidden = ppHidden pp . clickable
, ppHiddenNoWindows = ppHiddenNoWindows pp . clickable
, ppVisibleNoWindows= ppVisibleNoWindows pp <&> (. clickable)
, ppUrgent = ppUrgent pp . clickable
}