diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2010-12-08 20:29:59 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2010-12-08 20:29:59 -0500 |
| commit | 0054cc5beec8fe7673443f3a4a6a7a878a7f400d (patch) | |
| tree | c689a82a4a25e37fae72932a947386ced8e66bb0 | |
| parent | 73ac9faa18b948242ada9b90a365fdf0d238d2d2 (diff) | |
| download | xmobar-0054cc5beec8fe7673443f3a4a6a7a878a7f400d.tar.gz xmobar-0054cc5beec8fe7673443f3a4a6a7a878a7f400d.tar.bz2 | |
Remove auto*% options
The -P option now covers this case.
| -rw-r--r-- | Plugins/Monitors/MultiCpu.hs | 11 | ||||
| -rw-r--r-- | README | 9 |
2 files changed, 5 insertions, 15 deletions
diff --git a/Plugins/Monitors/MultiCpu.hs b/Plugins/Monitors/MultiCpu.hs index f32c966..17620d5 100644 --- a/Plugins/Monitors/MultiCpu.hs +++ b/Plugins/Monitors/MultiCpu.hs @@ -22,7 +22,6 @@ multiCpuConfig :: IO MConfig multiCpuConfig = mkMConfig "Cpu: <total>%" $ map ("auto" ++) monitors - ++ map ((++ "%") . ("auto" ++)) monitors ++ [ k ++ n | n <- "" : map show [0 :: Int ..] , k <- monitors] where monitors = ["bar","total","user","nice","system","idle"] @@ -73,17 +72,9 @@ formatAutoCpus :: [String] -> Monitor [String] formatAutoCpus [] = return $ replicate 6 "" formatAutoCpus xs = return $ map concat . map (intersperse " ") $ groupData xs -formatAutoCpusPercents :: [String] -> Monitor [String] -formatAutoCpusPercents [] = return $ replicate 6 "" -formatAutoCpusPercents xs = return $ map concat . map (intersperse " ") $ withPercents groups - where groups = groupData xs - withPercents [] = [] - withPercents (y:ys) = y : (map (map (++ "%")) (tail ys)) - runMultiCpu :: [String] -> Monitor String runMultiCpu _ = do c <- io parseCpuData l <- formatMultiCpus c a <- formatAutoCpus l - p <- formatAutoCpusPercents l - parseTemplate (a ++ p ++ l) + parseTemplate (a ++ l) @@ -371,12 +371,11 @@ Monitors have default aliases. - Args: default monitor arguments (see below) - Variables that can be used with the `-t`/`--template` argument: `autototal`, `autobar`, `autouser`, `autonice`, - `autosystem`, `autoidle`, `autototal%`, `autobar%`, - `autouser%`, `autonice%`, `autosystem%`, `autoidle%`, - `total`, `bar`, `user`, `nice`, `system`, `idle`, - `total0`, `bar0`, `user0`, `nice0`, `system0`, `idle0`, ... + `autosystem`, `autoidle`, `total`, `bar`, `user`, `nice`, + `system`, `idle`, `total0`, `bar0`, `user0`, `nice0`, + `system0`, `idle0`, ... - The auto* variables automatically detect the number of CPUs on the system - and displays one entry for each, with or without a trailing '%'. + and displays one entry for each. - Default template: `Cpu: <total>%` `Battery Args RefreshRate` |