summaryrefslogtreecommitdiffhomepage
path: root/src/Plugins/Monitors
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2014-12-26 18:20:49 +0100
committerjao <jao@gnu.org>2014-12-26 18:20:49 +0100
commit636c6edc8a6d799846aece65744643e4adb0e82c (patch)
tree11e5a5369aa1d400529a3086c0b7af85af97c183 /src/Plugins/Monitors
parentf28609ca929d427be34ee4ce6cf8e2c6aa89b63d (diff)
downloadxmobar-636c6edc8a6d799846aece65744643e4adb0e82c.tar.gz
xmobar-636c6edc8a6d799846aece65744643e4adb0e82c.tar.bz2
Honour the -S (show suffix) monitor flag in CpuFreq
Diffstat (limited to 'src/Plugins/Monitors')
-rw-r--r--src/Plugins/Monitors/CpuFreq.hs22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Plugins/Monitors/CpuFreq.hs b/src/Plugins/Monitors/CpuFreq.hs
index d3ecf89..8301547 100644
--- a/src/Plugins/Monitors/CpuFreq.hs
+++ b/src/Plugins/Monitors/CpuFreq.hs
@@ -18,22 +18,24 @@ import Plugins.Monitors.Common
import Plugins.Monitors.CoreCommon
-- |
--- Cpu frequency default configuration. Default template contains only one
--- core frequency, user should specify custom template in order to get more
--- cpu frequencies.
+-- Cpu frequency default configuration. Default template contains only
+-- one core frequency, user should specify custom template in order to
+-- get more cpu frequencies.
cpuFreqConfig :: IO MConfig
-cpuFreqConfig = mkMConfig
- "Freq: <cpu0>" -- template
- (map ((++) "cpu" . show) [0 :: Int ..]) -- available
- -- replacements
+cpuFreqConfig =
+ mkMConfig "Freq: <cpu0>" (map ((++) "cpu" . show) [0 :: Int ..])
+
-- |
--- Function retrieves monitor string holding the cpu frequency (or frequencies)
+-- Function retrieves monitor string holding the cpu frequency (or
+-- frequencies)
runCpuFreq :: [String] -> Monitor String
runCpuFreq _ = do
+ suffix <- getConfigValue useSuffix
let path = ["/sys/devices/system/cpu/cpu", "/cpufreq/scaling_cur_freq"]
divisor = 1e6 :: Double
- fmt x | x < 1 = show (round (x * 1000) :: Integer) ++ "MHz"
- | otherwise = show x ++ "GHz"
+ fmt x | x < 1 = show (round (x * 1000) :: Integer) ++
+ if suffix then "MHz" else ""
+ | otherwise = show x ++ if suffix then "GHz" else ""
failureMessage <- getConfigValue naString
checkedDataRetrieval failureMessage [path] Nothing (/divisor) fmt