From 51f43202735c51ca93e9552f4f7508aa565e8f4e Mon Sep 17 00:00:00 2001
From: Andrea Rossato <andrea.rossato@ing.unitn.it>
Date: Fri, 12 Oct 2007 21:39:44 +0200
Subject: Allow setting the foreground color

Now it is possible dynamically set the foreground color of strings to
be displayed with the <fc

darcs-hash:20071012193944-d6583-14ce9e84b1d5223b790e771f0b82cf354d58d744.gz
---
 Xmobar.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'Xmobar.hs')

diff --git a/Xmobar.hs b/Xmobar.hs
index e8091a7..5e79009 100644
--- a/Xmobar.hs
+++ b/Xmobar.hs
@@ -183,10 +183,17 @@ printStrings dr gc fontst offs sl@((s,c,l):xs) = do
                       "right"  -> remWidth - 1
                       "left"   -> offs
                       _        -> offs
-  fgcolor <- io $ initColor d c
-  bgcolor <- io $ initColor d (bgColor conf)
-  io $ setForeground d gc fgcolor
-  io $ setBackground d gc bgcolor
+  (fc,bc) <- case (break (==',') c) of
+               (f,',':b) -> do
+                 fgc <- io $ initColor d f
+                 bgc <- io $ initColor d b
+                 return (fgc,bgc) 
+               (f,_) -> do
+                 fgc <- io $ initColor d f
+                 bgc <- io $ initColor d (bgColor conf)
+                 return (fgc,bgc) 
+  io $ setForeground d gc fc
+  io $ setBackground d gc bc
   io $ drawImageString d dr gc offset valign s
   printStrings dr gc fontst (offs + l) xs
 
@@ -223,7 +230,7 @@ Utilities
 -- given the black pixel will be returned.
 initColor :: Display -> String -> IO Pixel
 initColor dpy c =
-    catch (initColor' dpy c) (const $ return $ blackPixel dpy (defaultScreen dpy))
+    catch (initColor' dpy c) (const . return . blackPixel dpy $ (defaultScreen dpy))
 
 initColor' :: Display -> String -> IO Pixel
 initColor' dpy c = (color_pixel . fst) `liftM` allocNamedColor dpy colormap c
-- 
cgit v1.2.3