diff options
| -rw-r--r-- | doc/compiling.org | 19 | ||||
| -rw-r--r-- | doc/quick-start.org | 14 | ||||
| -rw-r--r-- | etc/xmobar.config | 12 | ||||
| -rw-r--r-- | src/Xmobar/Config/Parse.hs | 11 | ||||
| -rw-r--r-- | src/Xmobar/X11/ColorCache.hs | 54 | ||||
| -rw-r--r-- | src/Xmobar/X11/Draw.hs | 10 | ||||
| -rw-r--r-- | src/Xmobar/X11/Loop.hs | 4 | ||||
| -rw-r--r-- | src/Xmobar/X11/Text.hs | 14 | ||||
| -rw-r--r-- | src/Xmobar/X11/XlibDraw.hs | 28 | ||||
| -rw-r--r-- | xmobar.cabal | 23 |
10 files changed, 51 insertions, 138 deletions
diff --git a/doc/compiling.org b/doc/compiling.org index b4159df..dabcec6 100644 --- a/doc/compiling.org +++ b/doc/compiling.org @@ -57,20 +57,27 @@ them to =stack= directly: - =with_threaded= Uses GHC's threaded runtime. Use this option if xmobar enters a high-CPU regime right after starting. - - =with_utf8= UTF-8 support. Requires the [[http://hackage.haskell.org/package/utf8-string/][utf8-string]] package. + - =with_xft= Antialiased font support. Deprecated: use =with_cairo= instead. - - =with_xft= Antialiased fonts. Requires the [[http://hackage.haskell.org/package/X11-xft/][X11-xft]] package. This - option automatically enables UTF-8. To use XFT fonts you need to use - the =xft:= prefix in the =font= configuration option. For instance: + - =with_cairo= Antialiased fonts via Cairo/Pango. Requires the [[http://hackage.haskell.org/package/X11-xft/][X11-xft]] + package. This option automatically enables UTF-8. To use XFT fonts you + can use their fontconfig name, e.g #+begin_src haskell - font = "xft:Times New Roman-10:italic" + font = "Iosevka Medium 10" + font = "DejaVu Sans Mono italic 9" #+end_src Or to have fallback fonts, just separate them by commas: #+begin_src haskell - font = "xft:Open Sans:size=9,WenQuanYi Zen Hei:size=9" + font = "Open Sans,WenQuanYi Zen Hei 9" + #+end_src + + For backwards compatibility, font names with `xft:` are also supported. + + #+begin_src haskell + font = "xft:DejaVu Sans Mono-10" #+end_src - =with_mpd= Enables support for the [[http://mpd.wikia.com/][MPD]] daemon. Requires the [[http://hackage.haskell.org/package/libmpd/][libmpd]] diff --git a/doc/quick-start.org b/doc/quick-start.org index a206a45..55d3331 100644 --- a/doc/quick-start.org +++ b/doc/quick-start.org @@ -59,12 +59,10 @@ configuration language, see [[../etc/xmobar.config][etc/xmobar.config]], and you Here are all the global configuration options that you can set within the =Config= block in your configuration. - - =font= Name of the font to be used. Use the =xft:= prefix for XFT - fonts. + - =font= Name of the font to be used. - =additionalFonts= Haskell-style list of fonts to be used with the - =fn=-template. Use the =xft:= prefix for XFT fonts. See also - =textOffsets= below. For example: + =fn=-template. See also =textOffsets= below. For example: #+begin_src haskell additionalFonts = [iconFont, altIconFont] @@ -237,10 +235,10 @@ configuration language, see [[../etc/xmobar.config][etc/xmobar.config]], and you contain markups to change the characters' color. - =<fc=#FF0000>string</fc>= will print =string= with =#FF0000= color - (red). =<fc=#FF0000,#000000>string</fc>= will print =string= in red - with a black background (=#000000=). Background absolute offsets can - be specified for XFT fonts. =<fc=#FF0000,#000000:0>string</fc>= will - have a background matching the bar's height. + (red). =<fc=#FF0000,#000000>string</fc>= will print =string= in red with a + black background (=#000000=). Background absolute offsets can be specified + for fonts. =<fc=#FF0000,#000000:0>string</fc>= will have a background + matching the bar's height. - =<fn=1>string</fn>= will print =string= with the first font from =additionalFonts=. The index =0= corresponds to the standard font. diff --git a/etc/xmobar.config b/etc/xmobar.config index e951b67..5697e8c 100644 --- a/etc/xmobar.config +++ b/etc/xmobar.config @@ -1,10 +1,10 @@ -Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" - , additionalFonts = [] +Config { font = "DejaVu Sans Mono 9" + , additionalFonts = ["DejaVu Sans Mono italic 9"] , borderColor = "black" - , border = TopB + , border = FullB , bgColor = "black" - , fgColor = "grey" - , alpha = 255 + , fgColor = "whitesmoke" + , alpha = 128 , position = Top , textOffset = -1 , iconOffset = -1 @@ -35,5 +35,5 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" , sepChar = "%" , alignSep = "}{" , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }\ - \{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%" + \{ <fc=#ee9a00><fn=1>%date%</fn></fc>| %EGPF% | %uname%" } diff --git a/src/Xmobar/Config/Parse.hs b/src/Xmobar/Config/Parse.hs index 65e1af8..41088e9 100644 --- a/src/Xmobar/Config/Parse.hs +++ b/src/Xmobar/Config/Parse.hs @@ -26,16 +26,7 @@ import Data.Functor ((<&>)) import Xmobar.Config.Types -#ifdef XFT import qualified System.IO as S (readFile) -#endif - -readFileSafe :: FilePath -> IO String -#ifdef XFT -readFileSafe = S.readFile -#else -readFileSafe = readFile -#endif stripComments :: String -> String stripComments = @@ -182,4 +173,4 @@ commandsErr = "commands: this usually means that a command could not" ++ -- parsed. readConfig :: Config -> FilePath -> IO (Either ParseError (Config,[String])) readConfig defaultConfig f = - liftIO (readFileSafe f) <&> parseConfig defaultConfig + liftIO (S.readFile f) <&> parseConfig defaultConfig diff --git a/src/Xmobar/X11/ColorCache.hs b/src/Xmobar/X11/ColorCache.hs index 4d22e16..b981775 100644 --- a/src/Xmobar/X11/ColorCache.hs +++ b/src/Xmobar/X11/ColorCache.hs @@ -2,7 +2,7 @@ ------------------------------------------------------------------------------ -- | -- Module: ColorCache --- Copyright: (c) 2012 Jose Antonio Ortega Ruiz +-- Copyright: (c) 2012, 2022 Jose Antonio Ortega Ruiz -- License: BSD3-style (see LICENSE) -- -- Maintainer: jao@gnu.org @@ -15,18 +15,8 @@ -- ------------------------------------------------------------------------------ -#if defined XFT - -module Xmobar.X11.ColorCache(withColors, withDrawingColors) where - -import Xmobar.X11.MinXft - -#else - module Xmobar.X11.ColorCache(withColors) where -#endif - import Data.IORef import System.IO.Unsafe (unsafePerformIO) import Control.Monad.Trans (MonadIO, liftIO) @@ -67,45 +57,3 @@ withColors :: MonadIO m => Display -> [String] -> ([Pixel] -> m a) -> m a withColors d cs f = do ps <- mapM (liftIO . initColor d) cs f $ map (\(DynPixel _ pixel) -> pixel) ps - -#ifdef XFT - -type AXftColorCache = [(String, AXftColor)] -{-# NOINLINE xftColorCache #-} -xftColorCache :: IORef AXftColorCache -xftColorCache = unsafePerformIO $ newIORef [] - -getXftCachedColor :: String -> IO (Maybe AXftColor) -getXftCachedColor name = lookup name `fmap` readIORef xftColorCache - -putXftCachedColor :: String -> AXftColor -> IO () -putXftCachedColor name cptr = - modifyIORef xftColorCache $ \c -> (name, cptr) : c - -initAXftColor' :: Display -> Visual -> Colormap -> String -> IO AXftColor -initAXftColor' d v cm c = do - cc <- getXftCachedColor c - c' <- case cc of - Just col -> return col - _ -> do c'' <- mallocAXftColor d v cm c - putXftCachedColor c c'' - return c'' - return c' - -initAXftColor :: Display -> Visual -> Colormap -> String -> IO AXftColor -initAXftColor d v cm c = handle black $ (initAXftColor' d v cm c) - where - black :: SomeException -> IO AXftColor - black = (const $ initAXftColor' d v cm "black") - -withDrawingColors :: -- MonadIO m => - Display -> Drawable -> String -> String - -> (AXftDraw -> AXftColor -> AXftColor -> IO ()) -> IO () -withDrawingColors dpy drw fc bc f = do - let screen = defaultScreenOfDisplay dpy - colormap = defaultColormapOfScreen screen - visual = defaultVisualOfScreen screen - fc' <- initAXftColor dpy visual colormap fc - bc' <- initAXftColor dpy visual colormap bc - withAXftDraw dpy drw visual colormap $ \draw -> f draw fc' bc' -#endif diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs index 853ed03..5139aa9 100644 --- a/src/Xmobar/X11/Draw.hs +++ b/src/Xmobar/X11/Draw.hs @@ -27,12 +27,9 @@ import Graphics.X11.Xlib hiding (Segment) import Xmobar.Run.Parsers (Segment) import Xmobar.X11.Types -#if defined(XFT) || defined(CAIRO) +#ifdef CAIRO import Xmobar.Config.Types import Xmobar.X11.XRender (drawBackground) -#endif - -#ifdef CAIRO import Xmobar.X11.CairoDraw #else import Xmobar.X11.XlibDraw @@ -50,14 +47,11 @@ drawInWin segments = do gc <- liftIO $ createGC d w liftIO $ setGraphicsExposures d gc False -#if defined(XFT) || defined(CAIRO) +#ifdef CAIRO let cconf = config xconf alph = alpha cconf when (alph < 255) (liftIO $ drawBackground d p (bgColor cconf) alph (Rectangle 0 0 wid ht)) -#endif - -#ifdef CAIRO res <- drawInPixmap gc p segments #else res <- updateActions (rect xconf) segments diff --git a/src/Xmobar/X11/Loop.hs b/src/Xmobar/X11/Loop.hs index 8b68944..e6feda0 100644 --- a/src/Xmobar/X11/Loop.hs +++ b/src/Xmobar/X11/Loop.hs @@ -60,7 +60,7 @@ import Xmobar.Run.Loop (loop) import Xmobar.X11.Events(nextEvent') #endif -#ifdef XFT +#ifdef CAIRO import Graphics.X11.Xft #endif @@ -77,7 +77,7 @@ x11Loop conf = do let ic = Map.empty to = textOffset conf ts = textOffsets conf ++ replicate (length fl) to -#ifdef XFT +#ifdef CAIRO xftInitFtLibrary #endif (r,w) <- createWin d fs conf diff --git a/src/Xmobar/X11/Text.hs b/src/Xmobar/X11/Text.hs index 36a2a12..f3c5e05 100644 --- a/src/Xmobar/X11/Text.hs +++ b/src/Xmobar/X11/Text.hs @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Xmobar.X11.Text --- Copyright : (C) 2011, 2012, 2013, 2014, 2015, 2017, 2018 Jose Antonio Ortega Ruiz +-- Copyright : (C) 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2022 Jose Antonio Ortega Ruiz -- (C) 2007 Andrea Rossato -- License : BSD3 -- @@ -30,7 +30,7 @@ import qualified Graphics.X11.Xlib as Xlib (textExtents, textWidth) import Graphics.X11.Xlib.Extras import System.Mem.Weak ( addFinalizer ) -#if defined XFT +#ifdef CAIRO import Xmobar.X11.MinXft import Graphics.X11.Xrender #else @@ -39,7 +39,7 @@ import System.IO(hPutStrLn, stderr) data XFont = Core FontStruct | Utf8 FontSet -#ifdef XFT +#ifdef CAIRO | Xft [AXftFont] #endif @@ -49,7 +49,7 @@ initFont :: Display -> String -> IO XFont initFont d s = let xftPrefix = "xft:" in if xftPrefix `isPrefixOf` s then -#ifdef XFT +#ifdef CAIRO fmap Xft $ initXftFont d s #else do @@ -86,7 +86,7 @@ initUtf8Font d s = do fallBack :: SomeException -> IO ([String], String, FontSet) fallBack = const $ createFontSet d miscFixedFont -#ifdef XFT +#ifdef CAIRO initXftFont :: Display -> String -> IO [AXftFont] initXftFont d s = do let fontNames = wordsBy (== ',') (drop 4 s) @@ -106,7 +106,7 @@ initXftFont d s = do textWidth :: Display -> XFont -> String -> IO Int textWidth _ (Utf8 fs) s = return $ fromIntegral $ wcTextEscapement fs s textWidth _ (Core fs) s = return $ fromIntegral $ Xlib.textWidth fs s -#ifdef XFT +#ifdef CAIRO textWidth dpy (Xft xftdraw) s = do gi <- xftTxtExtents' dpy xftdraw s return $ xglyphinfo_xOff gi @@ -121,7 +121,7 @@ textExtents (Utf8 fs) s = do ascent = fromIntegral $ negate (rect_y rl) descent = fromIntegral $ rect_height rl + fromIntegral (rect_y rl) return (ascent, descent) -#ifdef XFT +#ifdef CAIRO textExtents (Xft xftfonts) _ = do ascent <- fromIntegral `fmap` xft_ascent' xftfonts descent <- fromIntegral `fmap` xft_descent' xftfonts diff --git a/src/Xmobar/X11/XlibDraw.hs b/src/Xmobar/X11/XlibDraw.hs index 15a0ec7..5aec1eb 100644 --- a/src/Xmobar/X11/XlibDraw.hs +++ b/src/Xmobar/X11/XlibDraw.hs @@ -40,15 +40,10 @@ import Xmobar.X11.Text import Xmobar.X11.ColorCache import Xmobar.System.Utils (safeIndex) -#ifdef XFT -import Xmobar.X11.MinXft -import Graphics.X11.Xrender -#endif - fi :: (Integral a, Num b) => a -> b fi = fromIntegral -drawInPixmap :: GC -> Pixmap -> Dimension -> Dimension -> [[Segment]] -> X() +drawInPixmap :: GC -> Pixmap -> Dimension -> Dimension -> [[Segment]] -> X () drawInPixmap gc p wid ht ~[left,center,right] = do r <- ask let c = config r @@ -61,14 +56,11 @@ drawInPixmap gc p wid ht ~[left,center,right] = do textWidth d (safeIndex fs i) s >>= \tw -> return (Text s,cl,i,fi tw) getWidth (Icon s,cl,i,_) = return (Icon s,cl,i,fi $ iconW s) getWidth (Hspace s,cl,i,_) = return (Hspace s,cl,i,fi s) - fillBackground clr = setForeground d gc clr >> fillRectangle d p gc 0 0 wid ht withColors d [bgColor c, borderColor c] $ \[bgcolor, bdcolor] -> do -#if XFT - when (alpha c == 255) $ liftIO (fillBackground bgcolor) -#else - liftIO $ fillBackground bgcolor -#endif + liftIO $ setForeground d gc bgcolor + liftIO $ fillRectangle d p gc 0 0 wid ht + -- write to the pixmap the new string printStrings p gc fs vs 1 L [] =<< strLn left printStrings p gc fs vs 1 R [] =<< strLn right @@ -115,18 +107,6 @@ printString d p (Utf8 fs) gc fc bc x y _ _ s a = when (a == 255) (setBackground d gc bc') liftIO $ wcDrawImageString d p fs gc x y s -#ifdef XFT -printString dpy drw fs@(Xft fonts) _ fc bc x y ay ht s al = - withDrawingColors dpy drw fc bc $ \draw fc' bc' -> do - when (al == 255) $ do - (a,d) <- textExtents fs s - gi <- xftTxtExtents' dpy fonts s - if ay < 0 - then drawXftRect draw bc' x (y - a) (1 + xglyphinfo_xOff gi) (a + d + 2) - else drawXftRect draw bc' x ay (1 + xglyphinfo_xOff gi) ht - drawXftString' draw fc' fonts (toInteger x) (toInteger y) s -#endif - -- | An easy way to print the stuff we need to print printStrings :: Drawable -> GC diff --git a/xmobar.cabal b/xmobar.cabal index c19b71d..c517aa6 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -33,11 +33,11 @@ source-repository head branch: master flag with_xft - description: Use Xft to render text. UTF-8 support included. + description: Use Xft to render text. Deprecated: use with_cairo instead. default: False flag with_cairo - description: Use Cairo and Pango to render text, instead of Xft. UTF-8 support included. + description: Use Cairo and Pango to render anti-aliased text. default: False flag with_inotify @@ -145,7 +145,6 @@ library Xmobar.X11.Text, Xmobar.X11.Types, Xmobar.X11.Window, - Xmobar.X11.XRender, Xmobar.Plugins.Command, Xmobar.Plugins.BufferedPipeReader, Xmobar.Plugins.CommandReader, @@ -230,21 +229,17 @@ library if flag(with_rtsopts) cpp-options: -DRTSOPTS - if flag(with_xft) || flag(all_extensions) - build-depends: utf8-string >= 0.3 && < 1.1, X11-xft >= 0.2 && < 0.4 - other-modules: Xmobar.X11.MinXft - cpp-options: -DXFT - - if flag(with_cairo) + if flag(with_cairo) || flag(all_extensions) || flag(with_xft) build-depends: cairo >= 0.13 && < 0.14, pango >= 0.13 && < 0.14, - colour >= 2.3.6 + colour >= 2.3.6, + X11-xft >= 0.2 && < 0.4 other-modules: Xmobar.X11.CairoSurface, - Xmobar.X11.CairoDraw - x-c2hs-header: xmobar-gtk2hs.h + Xmobar.X11.CairoDraw, + Xmobar.X11.XRender, + Xmobar.X11.MinXft cpp-options: -DCAIRO - - if !flag(with_cairo) || flag(with_xft) + else other-modules: Xmobar.X11.XlibDraw if flag(with_inotify) || flag(all_extensions) |