From 9c5f9b26bc19975f2486a11941821089ee62562a Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 24 Jun 2018 00:28:52 +0100
Subject: Fix: tag-respecting trimming of monitor oututs (-T, -E)

---
 src/Plugins/Monitors/Common.hs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Plugins/Monitors/Common.hs b/src/Plugins/Monitors/Common.hs
index 91d491e..782a18f 100644
--- a/src/Plugins/Monitors/Common.hs
+++ b/src/Plugins/Monitors/Common.hs
@@ -1,7 +1,7 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Plugins.Monitors.Common
--- Copyright   :  (c) 2010, 2011, 2013, 2016, 2017 Jose Antonio Ortega Ruiz
+-- Copyright   :  (c) 2010, 2011, 2013, 2016, 2017, 2018 Jose Antonio Ortega Ruiz
 --                (c) 2007-2010 Andrea Rossato
 -- License     :  BSD-style (see LICENSE)
 --
@@ -336,6 +336,19 @@ templateCommandParser =
 templateParser :: Parser [(String,String,String)]
 templateParser = many templateStringParser --"%")
 
+trimTo :: Int -> String -> String -> (Int, String)
+trimTo n p "" = (n, p)
+trimTo n p ('<':cs) = trimTo n p' s
+  where p' = p ++ "<" ++ takeWhile (/= '>') cs ++ ">"
+        s = drop 1 (dropWhile (/= '>') cs)
+trimTo 0 p s = trimTo 0 p (dropWhile (/= '<') s)
+trimTo n p s = let p' = takeWhile (/= '<') s
+                   s' = dropWhile (/= '<') s
+               in
+                 if length p' <= n
+                 then trimTo (n - length p') (p ++ p') s'
+                 else trimTo 0 (p ++ take n p') s'
+
 -- | Takes a list of strings that represent the values of the exported
 -- keys. The strings are joined with the exported keys to form a map
 -- to be combined with 'combine' to the parsed template. Returns the
@@ -346,10 +359,13 @@ parseTemplate l =
     do t <- getConfigValue template
        e <- getConfigValue export
        w <- getConfigValue maxTotalWidth
-       ellipsis <- getConfigValue maxTotalWidthEllipsis
+       ell <- getConfigValue maxTotalWidthEllipsis
        let m = Map.fromList . zip e $ l
        s <- parseTemplate' t m
-       return $ if w > 0 && length s > w then take w s ++ ellipsis else s
+       let (n, s') = if w > 0 && length s > w
+                     then trimTo (w - length ell) "" s
+                     else (1, s)
+       return $ if n > 0 then s' else s' ++ ell
 
 -- | Parses the template given to it with a map of export values and combines
 -- them
-- 
cgit v1.2.3