Refactoring: Xmobar.X11

1 files changed, 0 insertions, 123 deletions

diff --git a/src/lib/Xmobar/Draw.hs b/src/lib/Xmobar/Draw.hs
deleted file mode 100644
index e63cd27..0000000
--- a/src/lib/Xmobar/Draw.hs
+++ /dev/null
@@ -1,123 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-------------------------------------------------------------------------------
--- |
--- Module: Xmobar.Draw
--- Copyright: (c) 2018 Jose Antonio Ortega Ruiz
--- License: BSD3-style (see LICENSE)
---
--- Maintainer: jao@gnu.org
--- Stability: unstable
--- Portability: portable
--- Created: Sat Nov 24, 2018 18:49
---
---
--- Drawing the xmobar contents
---
-------------------------------------------------------------------------------
-
-
-module Xmobar.Draw (drawInWin) where
-
-import Prelude hiding (lookup)
-import Control.Monad.IO.Class
-import Control.Monad.Reader
-import Control.Arrow ((&&&))
-import Data.Map hiding (foldr, map, filter)
-
-import Graphics.X11.Xlib hiding (textExtents, textWidth)
-
-import Xmobar.Parsers (Widget(..))
-import Xmobar.Actions (Action(..))
-import qualified Xmobar.Bitmap as B
-import Xmobar.Types
-import Xmobar.XUtil
-import Xmobar.Config
-import Xmobar.ColorCache
-import Xmobar.Window (drawBorder)
-
-#ifdef XFT
-import Xmobar.MinXft (drawBackground)
-#endif
-
-fi :: (Integral a, Num b) => a -> b
-fi = fromIntegral
-
--- | Draws in and updates the window
-drawInWin :: Rectangle -> [[(Widget, String, Int, Maybe [Action])]] -> X ()
-drawInWin wr@(Rectangle _ _ wid ht) ~[left,center,right] = do
-  r <- ask
-  let (c,d) = (config &&& display) r
-      (w,(fs,vs)) = (window &&& fontListS &&& verticalOffsets) r
-      strLn = liftIO . mapM getWidth
-      iconW i = maybe 0 B.width (lookup i $ iconS r)
-      getWidth (Text s,cl,i,_) =
-        textWidth d (fs!!i) s >>= \tw -> return (Text s,cl,i,fi tw)
-      getWidth (Icon s,cl,i,_) = return (Icon s,cl,i,fi $ iconW s)
-
-  p <- liftIO $ createPixmap d w wid ht
-                         (defaultDepthOfScreen (defaultScreenOfDisplay d))
-#if XFT
-  when (alpha c /= 255) (liftIO $ drawBackground d p (bgColor c) (alpha c) wr)
-#endif
-  withColors d [bgColor c, borderColor c] $ \[bgcolor, bdcolor] -> do
-    gc <- liftIO $ createGC  d w
-#if XFT
-    when (alpha c == 255) $ do
-#else
-    do
-#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
-    printStrings p gc fs vs 1 C =<< strLn center
-    -- draw border if requested
-    liftIO $ drawBorder (border c) (borderWidth c) d p gc bdcolor wid ht
-    -- copy the pixmap with the new string to the window
-    liftIO $ copyArea d p w gc 0 0 wid ht 0 0
-    -- free up everything (we do not want to leak memory!)
-    liftIO $ freeGC d gc
-    liftIO $ freePixmap d p
-    -- resync
-    liftIO $ sync d True
-
-verticalOffset :: (Integral b, Integral a, MonadIO m) =>
-                  a -> Widget -> XFont -> Int -> Config -> m b
-verticalOffset ht (Text t) fontst voffs _
-  | voffs > -1 = return $ fi voffs
-  | otherwise = do
-     (as,ds) <- liftIO $ textExtents fontst t
-     let margin = (fi ht - fi ds - fi as) `div` 2
-     return $ fi as + margin - 1
-verticalOffset ht (Icon _) _ _ conf
-  | iconOffset conf > -1 = return $ fi (iconOffset conf)
-  | otherwise = return $ fi (ht `div` 2) - 1
-
--- | An easy way to print the stuff we need to print
-printStrings :: Drawable -> GC -> [XFont] -> [Int] -> Position
-             -> Align -> [(Widget, String, Int, Position)] -> X ()
-printStrings _ _ _ _ _ _ [] = return ()
-printStrings dr gc fontlist voffs offs a sl@((s,c,i,l):xs) = do
-  r <- ask
-  let (conf,d) = (config &&& display) r
-      alph = alpha conf
-      Rectangle _ _ wid ht = rect r
-      totSLen = foldr (\(_,_,_,len) -> (+) len) 0 sl
-      remWidth = fi wid - fi totSLen
-      fontst = fontlist !! i
-      offset = case a of
-                 C -> (remWidth + offs) `div` 2
-                 R -> remWidth
-                 L -> offs
-      (fc,bc) = case break (==',') c of
-                 (f,',':b) -> (f, b           )
-                 (f,    _) -> (f, bgColor conf)
-  valign <- verticalOffset ht s (head fontlist) (voffs !! i) conf
-  case s of
-    (Text t) -> liftIO $ printString d dr fontst gc fc bc offset valign t alph
-    (Icon p) -> liftIO $ maybe (return ())
-                           (B.drawBitmap d dr gc fc bc offset valign)
-                           (lookup p (iconS r))
-  printStrings dr gc fontlist voffs (offs + l) a xs