summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2022-09-11 03:25:59 +0100
committerjao <jao@gnu.org>2022-09-11 03:26:51 +0100
commitd579c840a5038d45c4fecde84dc99d6b14677e20 (patch)
tree56922a65f68af15100906ccaa042648f2bf524dc
parent5df496dfff0d081a2e3448affc50a016f71b57b2 (diff)
downloadxmobar-d579c840a5038d45c4fecde84dc99d6b14677e20.tar.gz
xmobar-d579c840a5038d45c4fecde84dc99d6b14677e20.tar.bz2
fix for the default, non-cairo build
-rw-r--r--src/Xmobar/X11/Draw.hs6
-rw-r--r--xmobar.cabal4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs
index 643ec13..2d61b67 100644
--- a/src/Xmobar/X11/Draw.hs
+++ b/src/Xmobar/X11/Draw.hs
@@ -54,10 +54,10 @@ drawInWin conf bound@(Rectangle _ _ wid ht) segments = do
liftIO $ setGraphicsExposures d gc False
#if defined(XFT) || defined(CAIRO)
- let conf = config r
- alph = alpha conf
+ let xconf = config r
+ alph = alpha xconf
when (alph < 255)
- (liftIO $ drawBackground d p (bgColor conf) alph (Rectangle 0 0 wid ht))
+ (liftIO $ drawBackground d p (bgColor xconf) alph (Rectangle 0 0 wid ht))
#endif
#ifdef CAIRO
diff --git a/xmobar.cabal b/xmobar.cabal
index 31a36b4..c19b71d 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -146,7 +146,6 @@ library
Xmobar.X11.Types,
Xmobar.X11.Window,
Xmobar.X11.XRender,
- Xmobar.X11.XlibDraw,
Xmobar.Plugins.Command,
Xmobar.Plugins.BufferedPipeReader,
Xmobar.Plugins.CommandReader,
@@ -245,6 +244,9 @@ library
x-c2hs-header: xmobar-gtk2hs.h
cpp-options: -DCAIRO
+ if !flag(with_cairo) || flag(with_xft)
+ other-modules: Xmobar.X11.XlibDraw
+
if flag(with_inotify) || flag(all_extensions)
build-depends: hinotify >= 0.3 && < 0.5
other-modules: Xmobar.Plugins.Mail, Xmobar.Plugins.MBox