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

Use Data.Ord.comparing in DynamicLog

Browse Source 
This patch replaces (compare `on`) with Data.ord.comparing, so on doesn't have
to be defined.
This commit is contained in:
Shachaf Ben-Kiki
2007-06-20 01:10:16 +00:00
parent 88d77b244f
commit 013e4cfd62
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DynamicLog.hs
View File

@@ -30,6 +30,7 @@ module XMonadContrib.DynamicLog (
import XMonad
import Data.Maybe ( isJust )
import Data.List
import Data.Ord ( comparing )
import qualified StackSet as S
-- $usage
@@ -55,7 +56,7 @@ dynamicLog :: X ()
dynamicLog = withWindowSet $ io . putStrLn . pprWindowSet
pprWindowSet :: WindowSet -> String
pprWindowSet s = concatMap fmt $ sortBy (compare `on` S.tag)
pprWindowSet s = concatMap fmt $ sortBy (comparing S.tag)
(map S.workspace (S.current s : S.visible s) ++ S.hidden s)
where this = S.tag (S.workspace (S.current s))
visibles = map (S.tag . S.workspace) (S.visible s)
@@ -79,13 +80,10 @@ dynamicLogXinerama = withWindowSet $ io . putStrLn . pprWindowSetXinerama
pprWindowSetXinerama :: WindowSet -> String
pprWindowSetXinerama ws = "[" ++ unwords onscreen ++ "] " ++ unwords offscreen
where onscreen = map (pprTag . S.workspace)
. sortBy (compare `on` S.screen) $ S.current ws : S.visible ws
. sortBy (comparing S.screen) $ S.current ws : S.visible ws
offscreen = map pprTag . filter (isJust . S.stack)
. sortBy (compare `on` S.tag) $ S.hidden ws
. sortBy (comparing S.tag) $ S.hidden ws
-- util functions
pprTag :: Integral i => S.Workspace i a -> String
pprTag = show . (+(1::Int)) . fromIntegral . S.tag
on :: (a -> a -> c) -> (b -> a) -> b -> b -> c
on f g a b = (g a) `f` (g b)