From 4da4e91a5ab9361451bad2a51a565115bbc0d79e Mon Sep 17 00:00:00 2001
From: Jan Vornberger <jan.vornberger@informatik.uni-oldenburg.de>
Date: Sat, 24 Oct 2009 22:51:11 +0200
Subject: Extended paintAndWrite to allow for multiple strings to be written
 into the rectangle

Ignore-this: eb7d32284b7f98145038dcaa14f8075e

darcs-hash:20091024205111-594c5-33318832d5ca7d71ece560ea79d45109001eadfb.gz
---
 XMonad/Layout/Decoration.hs |  2 +-
 XMonad/Layout/ShowWName.hs  |  2 +-
 XMonad/Util/XUtils.hs       | 27 +++++++++++++++------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs
index b19603e..eee686b 100644
--- a/XMonad/Layout/Decoration.hs
+++ b/XMonad/Layout/Decoration.hs
@@ -374,7 +374,7 @@ updateDeco sh t fs ((w,_),(Just dw,Just (Rectangle _ _ wh ht))) = do
   let s = shrinkIt sh
   name <- shrinkWhile s (\n -> do size <- io $ textWidthXMF dpy fs n
                                   return $ size > fromIntegral wh - fromIntegral (ht `div` 2)) (show nw)
-  paintAndWrite dw fs wh ht 1 bc borderc tc bc AlignCenter name
+  paintAndWrite dw fs wh ht 1 bc borderc tc bc [AlignCenter] [name]
 updateDeco _ _ _ (_,(Just w,Nothing)) = hideWindow w
 updateDeco _ _ _ _ = return ()
 
diff --git a/XMonad/Layout/ShowWName.hs b/XMonad/Layout/ShowWName.hs
index c010843..5f9d49a 100644
--- a/XMonad/Layout/ShowWName.hs
+++ b/XMonad/Layout/ShowWName.hs
@@ -96,7 +96,7 @@ flashName c (Rectangle _ _ wh ht) wrs = do
       x     = (fi wh - width + 2) `div` 2
   w <- createNewWindow (Rectangle (fi x) (fi y) (fi width) (fi hight)) Nothing "" True
   showWindow w
-  paintAndWrite w f (fi width) (fi hight) 0 "" "" (swn_color c) (swn_bgcolor c) AlignCenter n
+  paintAndWrite w f (fi width) (fi hight) 0 "" "" (swn_color c) (swn_bgcolor c) [AlignCenter] [n]
   releaseXMF f
   io $ sync d False
   i <- startTimer (swn_fade c)
diff --git a/XMonad/Util/XUtils.hs b/XMonad/Util/XUtils.hs
index b37d438..1995d31 100644
--- a/XMonad/Util/XUtils.hs
+++ b/XMonad/Util/XUtils.hs
@@ -103,7 +103,8 @@ paintWindow :: Window     -- ^ The window where to draw
 paintWindow w wh ht bw c bc =
     paintWindow' w (Rectangle 0 0 wh ht) bw c bc Nothing
 
--- | Fill a window with a rectangle and a border, and write a string at given position
+-- | Fill a window with a rectangle and a border, and write
+-- | a number of strings to given positions
 paintAndWrite :: Window     -- ^ The window where to draw
               -> XMonadFont -- ^ XMonad Font for drawing
               -> Dimension  -- ^ Window width
@@ -113,19 +114,20 @@ paintAndWrite :: Window     -- ^ The window where to draw
               -> String     -- ^ Border color
               -> String     -- ^ String color
               -> String     -- ^ String background color
-              -> Align      -- ^ String 'Align'ment
-              -> String     -- ^ String to be printed
+              -> [Align]    -- ^ String 'Align'ments
+              -> [String]   -- ^ Strings to be printed
               -> X ()
-paintAndWrite w fs wh ht bw bc borc ffc fbc al str = do
+paintAndWrite w fs wh ht bw bc borc ffc fbc als strs = do
     d <- asks display
-    (x,y) <- stringPosition d fs (Rectangle 0 0 wh ht) al str
-    paintWindow' w (Rectangle x y wh ht) bw bc borc ms
-    where ms    = Just (fs,ffc,fbc,str)
+    strPositions <- forM (zip als strs) $ \(al, str) ->
+        stringPosition d fs (Rectangle 0 0 wh ht) al str
+    let ms = Just (fs,ffc,fbc, zip strs strPositions)
+    paintWindow' w (Rectangle 0 0 wh ht) bw bc borc ms
 
 -- This stuff is not exported
 
-paintWindow' :: Window -> Rectangle -> Dimension -> String -> String -> Maybe (XMonadFont,String,String,String) -> X ()
-paintWindow' win (Rectangle x y wh ht) bw color b_color str = do
+paintWindow' :: Window -> Rectangle -> Dimension -> String -> String -> Maybe (XMonadFont,String,String,[(String, (Position, Position))]) -> X ()
+paintWindow' win (Rectangle _ _ wh ht) bw color b_color strStuff = do
   d  <- asks display
   p  <- io $ createPixmap d win wh ht (defaultDepthOfScreen $ defaultScreenOfDisplay d)
   gc <- io $ createGC d p
@@ -138,9 +140,10 @@ paintWindow' win (Rectangle x y wh ht) bw color b_color str = do
   -- and now again
   io $ setForeground d gc color'
   io $ fillRectangle d p gc (fi bw) (fi bw) (wh - (bw * 2)) (ht - (bw * 2))
-  when (isJust str) $ do
-    let (xmf,fc,bc,s) = fromJust str
-    printStringXMF d p xmf gc fc bc x y s
+  when (isJust strStuff) $ do
+    let (xmf,fc,bc,strAndPos) = fromJust strStuff
+    forM_ strAndPos $ \(s, (x, y)) ->
+        printStringXMF d p xmf gc fc bc x y s
   -- copy the pixmap over the window
   io $ copyArea      d p win gc 0 0 wh ht 0 0
   -- free the pixmap and GC
-- 
cgit v1.2.3