summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrea Rossato <andrea.rossato@ing.unitn.it>2009-04-09 13:38:19 +0200
committerAndrea Rossato <andrea.rossato@ing.unitn.it>2009-04-09 13:38:19 +0200
commit83243937b55862136a0d41303d318d07e51db982 (patch)
tree71f558a763c5e405504130dbad903d88565e42d2
parent530371201a18e497e5ad328c14b93d78bc2017cc (diff)
downloadxmobar-83243937b55862136a0d41303d318d07e51db982.tar.gz
xmobar-83243937b55862136a0d41303d318d07e51db982.tar.bz2
trailing space and variable name for the XFT version of printString
Ignore-this: f39d8322665f04683ec99758d290cf49 darcs-hash:20090409113819-d6583-71f93fdd720f5c83fa833062ec4aaf991b432aec.gz
-rw-r--r--Parsers.hs2
-rw-r--r--XUtil.hsc2
2 files changed, 2 insertions, 2 deletions
diff --git a/Parsers.hs b/Parsers.hs
index 8792a69..8867dba 100644
--- a/Parsers.hs
+++ b/Parsers.hs
@@ -73,7 +73,7 @@ templateStringParser c = do
templateCommandParser :: Config -> Parser String
templateCommandParser c =
let chr = char . head . sepChar
- in between (chr c) (chr c) (allTillSep c)
+ in between (chr c) (chr c) (allTillSep c)
-- | Combines the template parsers
templateParser :: Config -> Parser [(String,String,String)]
diff --git a/XUtil.hsc b/XUtil.hsc
index fc0e7b9..0ea39a8 100644
--- a/XUtil.hsc
+++ b/XUtil.hsc
@@ -164,7 +164,7 @@ printString dpy drw fs@(Xft font) gc fc bc x y s = do
let screen = defaultScreenOfDisplay dpy
colormap = defaultColormapOfScreen screen
visual = defaultVisualOfScreen screen
- withColors d [bc] $ \[bcolor] -> do
+ withColors dpy [bc] $ \[bcolor] -> do
(a,d) <- textExtents fs s
gi <- xftTextExtents dpy font s
setForeground dpy gc bcolor