diff options
| author | jao <jao@gnu.org> | 2024-03-30 18:26:01 +0000 | 
|---|---|---|
| committer | jao <jao@gnu.org> | 2024-03-30 18:26:01 +0000 | 
| commit | 30d226ba5eca8847775d03403367dee1f1e3dcfc (patch) | |
| tree | b62d0f7f176f9f2b58d66866c3c6afb581334bd6 /src/Xmobar/Plugins/Monitors/Common | |
| parent | 3f4ae1034fe7575df05c59dd0c357fd448198594 (diff) | |
| download | xmobar-30d226ba5eca8847775d03403367dee1f1e3dcfc.tar.gz xmobar-30d226ba5eca8847775d03403367dee1f1e3dcfc.tar.bz2 | |
fix for unmet pattern matches warnings (clean build)
Diffstat (limited to 'src/Xmobar/Plugins/Monitors/Common')
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/Common/Output.hs | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/src/Xmobar/Plugins/Monitors/Common/Output.hs b/src/Xmobar/Plugins/Monitors/Common/Output.hs index 2d0e194..c0a00ab 100644 --- a/src/Xmobar/Plugins/Monitors/Common/Output.hs +++ b/src/Xmobar/Plugins/Monitors/Common/Output.hs @@ -3,7 +3,7 @@  ------------------------------------------------------------------------------  -- |  -- Module: Xmobar.Plugins.Monitors.Strings --- Copyright: (c) 2018, 2019, 2020, 2022 Jose Antonio Ortega Ruiz +-- Copyright: (c) 2018, 2019, 2020, 2022, 2024 Jose Antonio Ortega Ruiz  -- License: BSD3-style (see LICENSE)  --  -- Maintainer: jao@gnu.org @@ -88,9 +88,9 @@ pShowWithColors p f x = do  pColorizeString :: (Num a, Ord a, MonadIO m) => MonitorConfig -> a -> String -> m String  pColorizeString p x s = do      let col = pSetColor p s -        [ll,hh] = map fromIntegral $ sort [pLow p, pHigh p] -- consider high < low -    pure $ head $ [col pHighColor   | x > hh ] ++ -                  [col pNormalColor | x > ll ] ++ +        cols = map fromIntegral $ sort [pLow p, pHigh p] -- consider high < low +    pure $ head $ [col pHighColor   | x > (cols !! 1) ] ++ +                  [col pNormalColor | x > head cols ] ++                    [col pLowColor    | True]  pSetColor :: MonitorConfig -> String -> PSelector (Maybe String) -> String @@ -197,9 +197,9 @@ colorizeString x s = do      h <- getConfigValue high      l <- getConfigValue low      let col = setColor s -        [ll,hh] = map fromIntegral $ sort [l, h] -- consider high < low -    head $ [col highColor   | x > hh ] ++ -           [col normalColor | x > ll ] ++ +        cols = map fromIntegral $ sort [l, h] -- consider high < low +    head $ [col highColor   | x > cols !! 1 ] ++ +           [col normalColor | x > head cols ] ++             [col lowColor    | True]  showWithColors :: (Num a, Ord a) => (a -> String) -> a -> Monitor String @@ -260,11 +260,11 @@ logScaling f v = do    h <- fromIntegral `fmap` getConfigValue high    l <- fromIntegral `fmap` getConfigValue low    bw <- fromIntegral `fmap` getConfigValue barWidth -  let [ll, hh] = sort [l, h] +  let ws = sort [l, h]        bw' = if bw > 0 then bw else 10        scaled x | x == 0.0 = 0 -               | x <= ll = 1 / bw' -               | otherwise = f + logBase 2 (x / hh) / bw' +               | x <= head ws = 1 / bw' +               | otherwise = f + logBase 2 (x / ws !! 1) / bw'    return $ scaled v  showLogBar :: Float -> Float -> Monitor String | 
