diff options
| author | Sibi Prabakaran <sibi@psibi.in> | 2020-05-10 19:43:56 +0530 |
|---|---|---|
| committer | Sibi Prabakaran <sibi@psibi.in> | 2020-05-10 19:43:56 +0530 |
| commit | 3e9e1cb9d300e13109206496d825351c4f41cc1c (patch) | |
| tree | d40f6c9f185ea4b01b6652e4178a5f28e450c8fa /src/Xmobar/X11 | |
| parent | 6f3b730415147041ff34558fe7292a76dc87b1f0 (diff) | |
| download | xmobar-3e9e1cb9d300e13109206496d825351c4f41cc1c.tar.gz xmobar-3e9e1cb9d300e13109206496d825351c4f41cc1c.tar.bz2 | |
Fix crashes/busy looping happening via index
Right now, with the `StdinReader` plugin enabled - you can crash/cause
busy looping of xmobar if the following html file is opened:
```
<html>
<head>
<title>hello <fn=1>string</fn> </title>
</head>
</html>
```
More details about this bug is here:
https://github.com/jaor/xmobar/issues/442#issuecomment-625706001
This MR also fixes another bug which produces a crash in xmobar if you
pass non integer items between fn:
<fn=crash>
Diffstat (limited to 'src/Xmobar/X11')
| -rw-r--r-- | src/Xmobar/X11/Draw.hs | 10 | ||||
| -rw-r--r-- | src/Xmobar/X11/Parsers.hs | 3 | ||||
| -rw-r--r-- | src/Xmobar/X11/Types.hs | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs index 23003b3..b7f58ca 100644 --- a/src/Xmobar/X11/Draw.hs +++ b/src/Xmobar/X11/Draw.hs @@ -25,6 +25,7 @@ import Control.Monad.Reader import Control.Monad (when) import Control.Arrow ((&&&)) import Data.Map hiding (foldr, map, filter) +import qualified Data.List.NonEmpty as NE import Graphics.X11.Xlib hiding (textExtents, textWidth) import Graphics.X11.Xlib.Extras @@ -37,6 +38,7 @@ import Xmobar.X11.Text import Xmobar.X11.ColorCache import Xmobar.X11.Window (drawBorder) import Xmobar.X11.Parsers (Widget(..)) +import Xmobar.System.Utils (safeIndex) #ifdef XFT import Xmobar.X11.MinXft @@ -55,7 +57,7 @@ drawInWin wr@(Rectangle _ _ wid ht) ~[left,center,right] = do strLn = liftIO . mapM getWidth iconW i = maybe 0 B.width (lookup i $ iconS r) getWidth (Text s,cl,i,_) = - textWidth d (fs!!i) s >>= \tw -> return (Text s,cl,i,fi tw) + textWidth d (safeIndex fs i) s >>= \tw -> return (Text s,cl,i,fi tw) getWidth (Icon s,cl,i,_) = return (Icon s,cl,i,fi $ iconW s) p <- liftIO $ createPixmap d w wid ht @@ -126,7 +128,7 @@ printString dpy drw fs@(Xft fonts) _ fc bc x y s al = #endif -- | An easy way to print the stuff we need to print -printStrings :: Drawable -> GC -> [XFont] -> [Int] -> Position +printStrings :: Drawable -> GC -> NE.NonEmpty XFont -> [Int] -> Position -> Align -> [(Widget, String, Int, Position)] -> X () printStrings _ _ _ _ _ _ [] = return () printStrings dr gc fontlist voffs offs a sl@((s,c,i,l):xs) = do @@ -136,7 +138,7 @@ printStrings dr gc fontlist voffs offs a sl@((s,c,i,l):xs) = do Rectangle _ _ wid ht = rect r totSLen = foldr (\(_,_,_,len) -> (+) len) 0 sl remWidth = fi wid - fi totSLen - fontst = fontlist !! i + fontst = safeIndex fontlist i offset = case a of C -> (remWidth + offs) `div` 2 R -> remWidth @@ -144,7 +146,7 @@ printStrings dr gc fontlist voffs offs a sl@((s,c,i,l):xs) = do (fc,bc) = case break (==',') c of (f,',':b) -> (f, b ) (f, _) -> (f, bgColor conf) - valign <- verticalOffset ht s (head fontlist) (voffs !! i) conf + valign <- verticalOffset ht s (NE.head fontlist) (voffs !! i) conf case s of (Text t) -> liftIO $ printString d dr fontst gc fc bc offset valign t alph (Icon p) -> liftIO $ maybe (return ()) diff --git a/src/Xmobar/X11/Parsers.hs b/src/Xmobar/X11/Parsers.hs index 7fa42d7..4c8a130 100644 --- a/src/Xmobar/X11/Parsers.hs +++ b/src/Xmobar/X11/Parsers.hs @@ -21,6 +21,7 @@ import Xmobar.X11.Actions import Control.Monad (guard, mzero) import Text.ParserCombinators.Parsec +import Text.Read (readMaybe) import Graphics.X11.Types (Button) data Widget = Icon String | Text String @@ -138,7 +139,7 @@ fontParser :: ColorString -> Maybe [Action] -> Parser [(Widget, ColorString, FontIndex, Maybe [Action])] fontParser c a = do f <- between (string "<fn=") (string ">") colors - s <- manyTill (allParsers c (read f) a) (try $ string "</fn>") + s <- manyTill (allParsers c (maybe 0 id $ readMaybe f) a) (try $ string "</fn>") return (concat s) -- | Parses a color specification (hex or named) diff --git a/src/Xmobar/X11/Types.hs b/src/Xmobar/X11/Types.hs index 333dc96..b22f807 100644 --- a/src/Xmobar/X11/Types.hs +++ b/src/Xmobar/X11/Types.hs @@ -20,6 +20,7 @@ module Xmobar.X11.Types (X, XConf (..)) where import Graphics.X11.Xlib import Control.Monad.Reader import Data.Map +import qualified Data.List.NonEmpty as NE import Xmobar.X11.Bitmap import Xmobar.X11.Text @@ -33,7 +34,7 @@ data XConf = XConf { display :: Display , rect :: Rectangle , window :: Window - , fontListS :: [XFont] + , fontListS :: NE.NonEmpty XFont , verticalOffsets :: [Int] , iconS :: Map FilePath Bitmap , config :: Config |