diff options
-rw-r--r-- | src/Xmobar/App/TextEventLoop.hs | 6 | ||||
-rw-r--r-- | src/Xmobar/App/X11EventLoop.hs | 2 | ||||
-rw-r--r-- | src/Xmobar/Run/Parsers.hs (renamed from src/Xmobar/X11/Parsers.hs) | 4 | ||||
-rw-r--r-- | src/Xmobar/X11/Bitmap.hs | 2 | ||||
-rw-r--r-- | src/Xmobar/X11/Draw.hs | 2 | ||||
-rw-r--r-- | xmobar.cabal | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/src/Xmobar/App/TextEventLoop.hs b/src/Xmobar/App/TextEventLoop.hs index ad7c33b..d41e1a7 100644 --- a/src/Xmobar/App/TextEventLoop.hs +++ b/src/Xmobar/App/TextEventLoop.hs @@ -29,7 +29,11 @@ import Control.Concurrent.STM import Xmobar.System.Signal import Xmobar.Config.Types (Config(textOutputFormat), TextOutputFormat(..)) import Xmobar.Run.Loop (initLoop, loop) -import Xmobar.X11.Parsers (Segment, Widget(..), parseString, tColorsString, colorComponents) +import Xmobar.Run.Parsers ( Segment + , Widget(..) + , parseString + , tColorsString + , colorComponents) -- | Starts the main event loop and threads textLoop :: Config -> IO () diff --git a/src/Xmobar/App/X11EventLoop.hs b/src/Xmobar/App/X11EventLoop.hs index 662c777..850738e 100644 --- a/src/Xmobar/App/X11EventLoop.hs +++ b/src/Xmobar/App/X11EventLoop.hs @@ -51,7 +51,7 @@ import Xmobar.Config.Types ( persistent , XPosition(..)) import Xmobar.Run.Actions -import Xmobar.X11.Parsers +import Xmobar.Run.Parsers import Xmobar.X11.Window import Xmobar.X11.Text import Xmobar.X11.Draw diff --git a/src/Xmobar/X11/Parsers.hs b/src/Xmobar/Run/Parsers.hs index 4a7e4eb..8a1ba0a 100644 --- a/src/Xmobar/X11/Parsers.hs +++ b/src/Xmobar/Run/Parsers.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | --- Module : Xmobar.X11.Parsers +-- Module : Xmobar.Run.Parsers -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- @@ -14,7 +14,7 @@ -- ----------------------------------------------------------------------------- -module Xmobar.X11.Parsers ( parseString +module Xmobar.Run.Parsers ( parseString , colorComponents , Segment , Box(..) diff --git a/src/Xmobar/X11/Bitmap.hs b/src/Xmobar/X11/Bitmap.hs index 2dd47ac..2aea470 100644 --- a/src/Xmobar/X11/Bitmap.hs +++ b/src/Xmobar/X11/Bitmap.hs @@ -24,8 +24,8 @@ import System.Directory (doesFileExist) import System.FilePath ((</>)) import System.Mem.Weak ( addFinalizer ) import Xmobar.Run.Actions (Action) +import Xmobar.Run.Parsers (TextRenderInfo(..), Widget(..)) import Xmobar.X11.ColorCache -import Xmobar.X11.Parsers (TextRenderInfo(..), Widget(..)) #ifdef XPM import Xmobar.X11.XPMFile(readXPMFile) diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs index 30f0b75..6a9a5d8 100644 --- a/src/Xmobar/X11/Draw.hs +++ b/src/Xmobar/X11/Draw.hs @@ -33,12 +33,12 @@ import Graphics.X11.Xlib.Extras import Xmobar.Config.Types import Xmobar.Run.Actions (Action(..)) +import Xmobar.Run.Parsers hiding (parseString) import qualified Xmobar.X11.Bitmap as B import Xmobar.X11.Types import Xmobar.X11.Text import Xmobar.X11.ColorCache import Xmobar.X11.Window (drawBorder) -import Xmobar.X11.Parsers hiding (parseString) import Xmobar.System.Utils (safeIndex) #ifdef XFT diff --git a/xmobar.cabal b/xmobar.cabal index 962d6b1..f812872 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -115,6 +115,7 @@ library Xmobar.Run.Exec, Xmobar.Run.Runnable Xmobar.Run.Actions, + Xmobar.Run.Parsers, Xmobar.Run.Loop, Xmobar.App.X11EventLoop, Xmobar.App.TextEventLoop, @@ -129,7 +130,6 @@ library Xmobar.System.Signal, Xmobar.System.Kbd, Xmobar.X11.Events, - Xmobar.X11.Parsers, Xmobar.X11.Types, Xmobar.X11.Text, Xmobar.X11.Bitmap, |