summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar/Plugins
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2019-05-23 17:56:15 +0100
committerjao <jao@gnu.org>2019-05-23 17:56:15 +0100
commit7aeb01c7dc010bd621d22bf342c599b4df9a1392 (patch)
tree96c29e8e7668df354a37f2acb2bd3225b487037e /src/Xmobar/Plugins
parent0ff8f6a7d6c775efa35698e067b4dd6c036ee2cd (diff)
downloadxmobar-7aeb01c7dc010bd621d22bf342c599b4df9a1392.tar.gz
xmobar-7aeb01c7dc010bd621d22bf342c599b4df9a1392.tar.bz2
New DiskIO template variables with bytes rather than speed (#390)
Diffstat (limited to 'src/Xmobar/Plugins')
-rw-r--r--src/Xmobar/Plugins/Monitors/Disk.hs25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Disk.hs b/src/Xmobar/Plugins/Monitors/Disk.hs
index 3f89629..0305d78 100644
--- a/src/Xmobar/Plugins/Monitors/Disk.hs
+++ b/src/Xmobar/Plugins/Monitors/Disk.hs
@@ -1,7 +1,7 @@
-----------------------------------------------------------------------------
-- |
-- Module : Plugins.Monitors.Disk
--- Copyright : (c) 2010, 2011, 2012, 2014, 2018 Jose A Ortega Ruiz
+-- Copyright : (c) 2010, 2011, 2012, 2014, 2018, 2019 Jose A Ortega Ruiz
-- License : BSD-style (see LICENSE)
--
-- Maintainer : Jose A Ortega Ruiz <jao@gnu.org>
@@ -54,9 +54,13 @@ parseDiskIOOpts argv =
diskIOConfig :: IO MConfig
diskIOConfig = mkMConfig "" ["total", "read", "write"
+ ,"totalb", "readb", "writeb"
,"totalbar", "readbar", "writebar"
+ ,"totalbbar", "readbbar", "writebbar"
,"totalvbar", "readvbar", "writevbar"
+ ,"totalbvbar", "readbvbar", "writebvbar"
,"totalipat", "readipat", "writeipat"
+ ,"totalbipat", "readbipat", "writebipat"
]
data DiskUOpts = DiskUOpts
@@ -148,11 +152,16 @@ parseDev dat dev =
case find ((==dev) . fst) dat of
Nothing -> (dev, [0, 0, 0])
Just (_, xs) ->
- let rSp = speed (xs !! 2) (xs !! 3)
- wSp = speed (xs !! 6) (xs !! 7)
- sp = speed (xs !! 2 + xs !! 6) (xs !! 3 + xs !! 7)
- speed x t = if t == 0 then 0 else 500 * x / t
- dat' = if length xs > 6 then [sp, rSp, wSp] else [0, 0, 0]
+ let r = xs !! 2
+ w = xs !! 6
+ t = r + w
+ rSp = speed r (xs !! 3)
+ wSp = speed w (xs !! 7)
+ sp = speed t (xs !! 3 + xs !! 7)
+ speed x d = if d == 0 then 0 else 500 * x / d
+ dat' = if length xs > 6
+ then [sp, rSp, wSp, t, r, w]
+ else [0, 0, 0, 0, 0, 0]
in (dev, dat')
speedToStr :: Float -> String
@@ -184,7 +193,9 @@ runDiskIO' opts (tmp, xs) = do
b <- mapM (showLogBar 0.8) xs
vb <- mapM (showLogVBar 0.8) xs
ipat <- mapM (\(f,v) -> showLogIconPattern (f opts) 0.8 v)
- $ zip [totalIconPattern, readIconPattern, writeIconPattern] xs
+ $ zip [totalIconPattern, readIconPattern, writeIconPattern
+ , totalIconPattern, readIconPattern, writeIconPattern]
+ xs
setConfigValue tmp template
parseTemplate $ s ++ b ++ vb ++ ipat