summaryrefslogtreecommitdiffhomepage
path: root/src/Plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/Plugins')
-rw-r--r--src/Plugins/Monitors/Cpu.hs7
-rw-r--r--src/Plugins/Monitors/MultiCpu.hs2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Plugins/Monitors/Cpu.hs b/src/Plugins/Monitors/Cpu.hs
index 6627f53..7116f5e 100644
--- a/src/Plugins/Monitors/Cpu.hs
+++ b/src/Plugins/Monitors/Cpu.hs
@@ -22,7 +22,7 @@ import Data.IORef (IORef, newIORef, readIORef, writeIORef)
cpuConfig :: IO MConfig
cpuConfig = mkMConfig
"Cpu: <total>%"
- ["bar","total","user","nice","system","idle","iowait"]
+ ["bar","vbar","total","user","nice","system","idle","iowait"]
type CpuDataRef = IORef [Float]
@@ -43,12 +43,13 @@ parseCpu cref =
return percent
formatCpu :: [Float] -> Monitor [String]
-formatCpu [] = return $ replicate 6 ""
+formatCpu [] = return $ replicate 8 ""
formatCpu xs = do
let t = sum $ take 3 xs
b <- showPercentBar (100 * t) t
+ v <- showVerticalBar (100 * t)
ps <- showPercentsWithColors (t:xs)
- return (b:ps)
+ return (b:v:ps)
runCpu :: CpuDataRef -> [String] -> Monitor String
runCpu cref _ =
diff --git a/src/Plugins/Monitors/MultiCpu.hs b/src/Plugins/Monitors/MultiCpu.hs
index 48c0bc1..2089fca 100644
--- a/src/Plugins/Monitors/MultiCpu.hs
+++ b/src/Plugins/Monitors/MultiCpu.hs
@@ -19,7 +19,9 @@ import qualified Data.ByteString.Lazy.Char8 as B
import Data.List (isPrefixOf, transpose, unfoldr)
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
+variables :: [String]
variables = ["bar", "vbar","total","user","nice","system","idle"]
+vNum :: Int
vNum = length variables
multiCpuConfig :: IO MConfig