From 30d226ba5eca8847775d03403367dee1f1e3dcfc Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 30 Mar 2024 18:26:01 +0000
Subject: fix for unmet pattern matches warnings (clean build)

---
 src/Xmobar/Draw/Boxes.hs | 11 +++++------
 src/Xmobar/Draw/Cairo.hs | 13 +++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/Xmobar/Draw')

diff --git a/src/Xmobar/Draw/Boxes.hs b/src/Xmobar/Draw/Boxes.hs
index 692e232..ff55ab3 100644
--- a/src/Xmobar/Draw/Boxes.hs
+++ b/src/Xmobar/Draw/Boxes.hs
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 -- |
 -- Module: Xmobar.X11.Boxes
--- Copyright: (c) 2022 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2022, 2024 Jose Antonio Ortega Ruiz
 -- License: BSD3-style (see LICENSE)
 --
 -- Maintainer: jao@gnu.org
@@ -43,11 +43,10 @@ boxLines (T.Box bd offset lw _ margins) ht x0 x1 =
                  T.C -> (ma, -ma)
                  T.R -> (ma, 0)
     lc = fromIntegral lw / 2
-    [mt, mr, mb, ml] = map fromIntegral [top, right, bot, left]
-    xmin = x0 - ml - lc
-    xmax = x1 + mr + lc
-    ymin = mt + lc
-    ymax = ht - mb - lc
+    xmin = x0 - fromIntegral left - lc
+    xmax = x1 + fromIntegral right + lc
+    ymin = fromIntegral top + lc
+    ymax = ht - fromIntegral bot - lc
     rtop = (xmin + p0, ymin, xmax + p1, ymin)
     rbot = (xmin + p0, ymax, xmax + p1, ymax)
     rleft = (xmin, ymin + p0, xmin, ymax + p1)
diff --git a/src/Xmobar/Draw/Cairo.hs b/src/Xmobar/Draw/Cairo.hs
index 8dcda5d..2338b10 100644
--- a/src/Xmobar/Draw/Cairo.hs
+++ b/src/Xmobar/Draw/Cairo.hs
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 -- |
 -- Module: Xmobar.X11.Cairo
--- Copyright: (c) 2022, 2023 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2022, 2023, 2024 Jose Antonio Ortega Ruiz
 -- License: BSD3-style (see LICENSE)
 --
 -- Maintainer: jao@gnu.org
@@ -169,21 +169,22 @@ drawCairoBackground dctx surf = do
 
 drawSegments :: T.DrawContext -> Surface -> IO T.Actions
 drawSegments dctx surf = do
-  let [left, center, right] = take 3 $ T.dcSegments dctx ++ repeat []
+  let segs = take 3 $ T.dcSegments dctx ++ repeat []
       dh = T.dcHeight dctx
       dw = T.dcWidth dctx
       conf = T.dcConfig dctx
       sWidth = foldl (\a (_,_,w) -> a + w) 0
   ctx <- Pango.cairoCreateContext Nothing
   Pango.cairoContextSetResolution ctx $ C.dpi conf
-  llyts <- mapM (withRenderinfo ctx dctx) left
-  rlyts <- mapM (withRenderinfo ctx dctx) right
-  clyts <- mapM (withRenderinfo ctx dctx) center
+  llyts <- mapM (withRenderinfo ctx dctx) (head segs)
+  rlyts <- mapM (withRenderinfo ctx dctx) (segs !! 2)
+  clyts <- mapM (withRenderinfo ctx dctx) (segs !! 1)
 #ifndef XRENDER
   drawCairoBackground dctx surf
 #endif
   (lend, as, bx) <- foldM (drawSegment dctx surf dw) (0, [], []) llyts
-  let [rw, cw] = map sWidth [rlyts, clyts]
+  let rw = sWidth rlyts
+      cw = sWidth clyts
       rstart = max lend (dw - rw)
       cstart = if lend > 1 || rw == 0 then max lend ((dw - cw) / 2.0) else lend
   (_, as', bx') <- if cw > 0
-- 
cgit v1.2.3