aboutsummaryrefslogtreecommitdiffstats
path: root/DynamicLog.hs
diff options
context:
space:
mode:
authorDavid Roundy <droundy@darcs.net>2007-08-20 13:38:13 +0200
committerDavid Roundy <droundy@darcs.net>2007-08-20 13:38:13 +0200
commit5edbb125958df0adadd354fae48877d36086abd5 (patch)
tree4221e1d3fa643e544fb7f37c53fe9aca84d26d7e /DynamicLog.hs
parentbf60ac7dec1866c77603dca5aec742951ec155ef (diff)
downloadXMonadContrib-5edbb125958df0adadd354fae48877d36086abd5.tar.gz
XMonadContrib-5edbb125958df0adadd354fae48877d36086abd5.tar.xz
XMonadContrib-5edbb125958df0adadd354fae48877d36086abd5.zip
make Contrib use WorkspaceId
darcs-hash:20070820113813-72aca-30984283cb9c04185fde9c89253af00e16912c10.gz
Diffstat (limited to 'DynamicLog.hs')
-rw-r--r--DynamicLog.hs14
1 files changed, 5 insertions, 9 deletions
diff --git a/DynamicLog.hs b/DynamicLog.hs
index 7447f43..4bcfec8 100644
--- a/DynamicLog.hs
+++ b/DynamicLog.hs
@@ -65,9 +65,9 @@ pprWindowSet s = concatMap fmt $ sortBy (comparing S.tag)
where this = S.tag (S.workspace (S.current s))
visibles = map (S.tag . S.workspace) (S.visible s)
- fmt w | S.tag w == this = "[" ++ pprTag w ++ "]"
- | S.tag w `elem` visibles = "<" ++ pprTag w ++ ">"
- | isJust (S.stack w) = " " ++ pprTag w ++ " "
+ fmt w | S.tag w == this = "[" ++ S.tag w ++ "]"
+ | S.tag w `elem` visibles = "<" ++ S.tag w ++ ">"
+ | isJust (S.stack w) = " " ++ S.tag w ++ " "
| otherwise = ""
-- |
@@ -83,11 +83,7 @@ dynamicLogXinerama = withWindowSet $ io . putStrLn . pprWindowSetXinerama
pprWindowSetXinerama :: WindowSet -> String
pprWindowSetXinerama ws = "[" ++ unwords onscreen ++ "] " ++ unwords offscreen
- where onscreen = map (pprTag . S.workspace)
+ where onscreen = map (S.tag . S.workspace)
. sortBy (comparing S.screen) $ S.current ws : S.visible ws
- offscreen = map pprTag . filter (isJust . S.stack)
+ offscreen = map S.tag . filter (isJust . S.stack)
. sortBy (comparing S.tag) $ S.hidden ws
-
--- util functions
-pprTag :: Integral i => S.Workspace i a -> String
-pprTag = show . (+(1::Int)) . fromIntegral . S.tag