summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-11-25 22:56:55 +0000
committerjao <jao@gnu.org>2018-11-25 22:56:55 +0000
commit54cf675f1299a74466950be240a708a762335d5d (patch)
tree570a3ca08a284ac84c02d29102c91c017e65eb25
parent01ef9a6549e6de63384f2e597804c11f0d837455 (diff)
downloadxmobar-54cf675f1299a74466950be240a708a762335d5d.tar.gz
xmobar-54cf675f1299a74466950be240a708a762335d5d.tar.bz2
X11.XUtil -> X11.Text
-rw-r--r--src/Xmobar/App/EventLoop.hs2
-rw-r--r--src/Xmobar/App/Main.hs2
-rw-r--r--src/Xmobar/X11/Draw.hs2
-rw-r--r--src/Xmobar/X11/Text.hs (renamed from src/Xmobar/X11/XUtil.hs)4
-rw-r--r--src/Xmobar/X11/Types.hs2
-rw-r--r--src/Xmobar/X11/Window.hs2
-rw-r--r--xmobar.cabal2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/Xmobar/App/EventLoop.hs b/src/Xmobar/App/EventLoop.hs
index c751511..8da617b 100644
--- a/src/Xmobar/App/EventLoop.hs
+++ b/src/Xmobar/App/EventLoop.hs
@@ -44,7 +44,7 @@ import Xmobar.Run.Commands
import Xmobar.Run.Runnable
import Xmobar.X11.Parsers
import Xmobar.X11.Window
-import Xmobar.X11.XUtil
+import Xmobar.X11.Text
import Xmobar.X11.Draw
import Xmobar.X11.Bitmap as Bitmap
import Xmobar.X11.Types
diff --git a/src/Xmobar/App/Main.hs b/src/Xmobar/App/Main.hs
index b180e39..34d73e5 100644
--- a/src/Xmobar/App/Main.hs
+++ b/src/Xmobar/App/Main.hs
@@ -28,7 +28,7 @@ import Xmobar.Config.Types
import Xmobar.System.Signal (setupSignalHandler, withDeferSignals)
import Xmobar.Run.Template
import Xmobar.X11.Types
-import Xmobar.X11.XUtil
+import Xmobar.X11.Text
import Xmobar.X11.Window
import Xmobar.App.EventLoop (startLoop, startCommand)
diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs
index 246eb84..e9be1fe 100644
--- a/src/Xmobar/X11/Draw.hs
+++ b/src/Xmobar/X11/Draw.hs
@@ -33,7 +33,7 @@ import Xmobar.Config.Types
import qualified Xmobar.X11.Bitmap as B
import Xmobar.X11.Actions (Action(..))
import Xmobar.X11.Types
-import Xmobar.X11.XUtil
+import Xmobar.X11.Text
import Xmobar.X11.ColorCache
import Xmobar.X11.Window (drawBorder)
import Xmobar.X11.Parsers (Widget(..))
diff --git a/src/Xmobar/X11/XUtil.hs b/src/Xmobar/X11/Text.hs
index 6e9eb2b..6466009 100644
--- a/src/Xmobar/X11/XUtil.hs
+++ b/src/Xmobar/X11/Text.hs
@@ -2,7 +2,7 @@
-----------------------------------------------------------------------------
-- |
--- Module : XUtil
+-- Module : Xmobar.X11.Text
-- Copyright : (C) 2011, 2012, 2013, 2014, 2015, 2017, 2018 Jose Antonio Ortega Ruiz
-- (C) 2007 Andrea Rossato
-- License : BSD3
@@ -13,7 +13,7 @@
--
-----------------------------------------------------------------------------
-module Xmobar.X11.XUtil
+module Xmobar.X11.Text
( XFont(..)
, initFont
, initCoreFont
diff --git a/src/Xmobar/X11/Types.hs b/src/Xmobar/X11/Types.hs
index f551c2a..333dc96 100644
--- a/src/Xmobar/X11/Types.hs
+++ b/src/Xmobar/X11/Types.hs
@@ -22,7 +22,7 @@ import Control.Monad.Reader
import Data.Map
import Xmobar.X11.Bitmap
-import Xmobar.X11.XUtil
+import Xmobar.X11.Text
import Xmobar.Config.Types
-- | The X type is a ReaderT
diff --git a/src/Xmobar/X11/Window.hs b/src/Xmobar/X11/Window.hs
index 23568ab..b8f56c6 100644
--- a/src/Xmobar/X11/Window.hs
+++ b/src/Xmobar/X11/Window.hs
@@ -29,7 +29,7 @@ import Data.Maybe (fromMaybe)
import System.Posix.Process (getProcessID)
import Xmobar.Config.Types
-import Xmobar.X11.XUtil
+import Xmobar.X11.Text
-- $window
diff --git a/xmobar.cabal b/xmobar.cabal
index ea1bcdd..3a2261e 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -113,7 +113,7 @@ library
Xmobar.X11.Actions,
Xmobar.X11.Parsers,
Xmobar.X11.Types,
- Xmobar.X11.XUtil,
+ Xmobar.X11.Text,
Xmobar.X11.Bitmap,
Xmobar.X11.ColorCache,
Xmobar.X11.Window,