summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorPavan Rikhi <pavan.rikhi@gmail.com>2018-03-17 22:48:24 -0400
committerjao <jao@gnu.org>2018-11-21 21:41:35 +0000
commit4d1402a1a7d87767267d48a77998e4fb13395b31 (patch)
tree17fd6160dc1fa9c8a0676a94bcf8d19b551c655c /src
parent9e2a5c7daddf683d4be7c318aefed3da3ea7a89a (diff)
downloadxmobar-4d1402a1a7d87767267d48a77998e4fb13395b31.tar.gz
xmobar-4d1402a1a7d87767267d48a77998e4fb13395b31.tar.bz2
Split Modules into Library & Executable Structure
Move the Main module to a new `app` directory. All other modules have been nested under the `Xmobar` name. Lots of module headers & imports were updated.
Diffstat (limited to 'src')
-rw-r--r--src/Main.hs258
-rw-r--r--src/Xmobar.hs24
-rw-r--r--src/Xmobar/Actions.hs (renamed from src/Actions.hs)2
-rw-r--r--src/Xmobar/Bitmap.hs (renamed from src/Bitmap.hs)10
-rw-r--r--src/Xmobar/ColorCache.hs (renamed from src/ColorCache.hs)6
-rw-r--r--src/Xmobar/Commands.hs (renamed from src/Commands.hs)6
-rw-r--r--src/Xmobar/Config.hs (renamed from src/Config.hs)34
-rw-r--r--src/Xmobar/Environment.hs (renamed from src/Environment.hs)2
-rw-r--r--src/Xmobar/IPC/DBus.hs (renamed from src/IPC/DBus.hs)4
-rw-r--r--src/Xmobar/Localize.hsc (renamed from src/Localize.hsc)2
-rw-r--r--src/Xmobar/MinXft.hsc (renamed from src/MinXft.hsc)2
-rw-r--r--src/Xmobar/Parsers.hs (renamed from src/Parsers.hs)10
-rw-r--r--src/Xmobar/Plugins.hs (renamed from src/Plugins.hs)6
-rw-r--r--src/Xmobar/Plugins/BufferedPipeReader.hs (renamed from src/Plugins/BufferedPipeReader.hs)8
-rw-r--r--src/Xmobar/Plugins/CommandReader.hs (renamed from src/Plugins/CommandReader.hs)4
-rw-r--r--src/Xmobar/Plugins/Date.hs (renamed from src/Plugins/Date.hs)4
-rw-r--r--src/Xmobar/Plugins/DateZone.hs (renamed from src/Plugins/DateZone.hs)8
-rw-r--r--src/Xmobar/Plugins/EWMH.hs (renamed from src/Plugins/EWMH.hs)6
-rw-r--r--src/Xmobar/Plugins/Kbd.hsc (renamed from src/Plugins/Kbd.hsc)6
-rw-r--r--src/Xmobar/Plugins/Locks.hs (renamed from src/Plugins/Locks.hs)8
-rw-r--r--src/Xmobar/Plugins/MBox.hs (renamed from src/Plugins/MBox.hs)6
-rw-r--r--src/Xmobar/Plugins/Mail.hs (renamed from src/Plugins/Mail.hs)6
-rw-r--r--src/Xmobar/Plugins/MarqueePipeReader.hs (renamed from src/Plugins/MarqueePipeReader.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors.hs (renamed from src/Plugins/Monitors.hs)56
-rw-r--r--src/Xmobar/Plugins/Monitors/Batt.hs (renamed from src/Plugins/Monitors/Batt.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Bright.hs (renamed from src/Plugins/Monitors/Bright.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/CatInt.hs (renamed from src/Plugins/Monitors/CatInt.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors/Common.hs (renamed from src/Plugins/Monitors/Common.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/CoreCommon.hs (renamed from src/Plugins/Monitors/CoreCommon.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/CoreTemp.hs (renamed from src/Plugins/Monitors/CoreTemp.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors/Cpu.hs (renamed from src/Plugins/Monitors/Cpu.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/CpuFreq.hs (renamed from src/Plugins/Monitors/CpuFreq.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors/Disk.hs (renamed from src/Plugins/Monitors/Disk.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors/MPD.hs (renamed from src/Plugins/Monitors/MPD.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Mem.hs (renamed from src/Plugins/Monitors/Mem.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Mpris.hs (renamed from src/Plugins/Monitors/Mpris.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/MultiCpu.hs (renamed from src/Plugins/Monitors/MultiCpu.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Net.hs (renamed from src/Plugins/Monitors/Net.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Swap.hs (renamed from src/Plugins/Monitors/Swap.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Thermal.hs (renamed from src/Plugins/Monitors/Thermal.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/ThermalZone.hs (renamed from src/Plugins/Monitors/ThermalZone.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Top.hs (renamed from src/Plugins/Monitors/Top.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/UVMeter.hs (renamed from src/Plugins/Monitors/UVMeter.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Uptime.hs (renamed from src/Plugins/Monitors/Uptime.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Volume.hs (renamed from src/Plugins/Monitors/Volume.hs)6
-rw-r--r--src/Xmobar/Plugins/Monitors/Weather.hs (renamed from src/Plugins/Monitors/Weather.hs)4
-rw-r--r--src/Xmobar/Plugins/Monitors/Wireless.hs (renamed from src/Plugins/Monitors/Wireless.hs)4
-rw-r--r--src/Xmobar/Plugins/PipeReader.hs (renamed from src/Plugins/PipeReader.hs)6
-rw-r--r--src/Xmobar/Plugins/StdinReader.hs (renamed from src/Plugins/StdinReader.hs)6
-rw-r--r--src/Xmobar/Plugins/Utils.hs (renamed from src/Plugins/Utils.hs)2
-rw-r--r--src/Xmobar/Plugins/XMonadLog.hs (renamed from src/Plugins/XMonadLog.hs)8
-rw-r--r--src/Xmobar/Runnable.hs (renamed from src/Runnable.hs)6
-rw-r--r--src/Xmobar/Runnable.hs-boot (renamed from src/Runnable.hs-boot)4
-rw-r--r--src/Xmobar/Signal.hs (renamed from src/Signal.hs)4
-rw-r--r--src/Xmobar/StatFS.hsc (renamed from src/StatFS.hsc)2
-rw-r--r--src/Xmobar/Window.hs (renamed from src/Window.hs)6
-rw-r--r--src/Xmobar/XPMFile.hsc (renamed from src/XPMFile.hsc)2
-rw-r--r--src/Xmobar/XUtil.hsc (renamed from src/XUtil.hsc)6
58 files changed, 190 insertions, 448 deletions
diff --git a/src/Main.hs b/src/Main.hs
deleted file mode 100644
index 9780114..0000000
--- a/src/Main.hs
+++ /dev/null
@@ -1,258 +0,0 @@
-{-# LANGUAGE FlexibleContexts #-}
------------------------------------------------------------------------------
--- |
--- Module : Xmobar.Main
--- Copyright : (c) Andrea Rossato
--- License : BSD-style (see LICENSE)
---
--- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org>
--- Stability : unstable
--- Portability : unportable
---
--- The main module of Xmobar, a text based status bar
---
------------------------------------------------------------------------------
-
-module Main ( -- * Main Stuff
- -- $main
- main
- , readConfig
- , readDefaultConfig
- ) where
-
-import Xmobar
-import Parsers
-import Config
-import XUtil
-
-import Data.Foldable (for_)
-import Data.List (intercalate)
-import qualified Data.Map as Map
-
-import Paths_xmobar (version)
-import Data.Version (showVersion)
-import Graphics.X11.Xlib
-import System.Console.GetOpt
-import System.Directory (getHomeDirectory)
-import System.Exit
-import System.Environment
-import System.FilePath ((</>))
-import System.Posix.Files
-import Control.Concurrent.Async (Async, cancel)
-import Control.Exception (bracket)
-import Control.Monad (unless)
-import Text.Read (readMaybe)
-
-import Signal (setupSignalHandler, withDeferSignals)
-
--- $main
-
--- | The main entry point
-main :: IO ()
-main = withDeferSignals $ do
- initThreads
- d <- openDisplay ""
- args <- getArgs
- (o,file) <- getOpts args
- (c,defaultings) <- case file of
- [cfgfile] -> readConfig cfgfile
- _ -> readDefaultConfig
-
- unless (null defaultings) $ putStrLn $
- "Fields missing from config defaulted: " ++ intercalate "," defaultings
-
- conf <- doOpts c o
- fs <- initFont d (font conf)
- fl <- mapM (initFont d) (additionalFonts conf)
- cls <- mapM (parseTemplate conf) (splitTemplate conf)
- sig <- setupSignalHandler
- bracket (mapM (mapM $ startCommand sig) cls)
- cleanupThreads
- $ \vars -> do
- (r,w) <- createWin d fs conf
- let ic = Map.empty
- to = textOffset conf
- ts = textOffsets conf ++ replicate (length fl) (-1)
- startLoop (XConf d r w (fs:fl) (to:ts) ic conf) sig vars
-
-cleanupThreads :: [[([Async ()], a)]] -> IO ()
-cleanupThreads vars =
- -- putStrLn "In cleanupThreads"
- for_ (concat vars) $ \(asyncs, _) ->
- for_ asyncs cancel
-
--- | Splits the template in its parts
-splitTemplate :: Config -> [String]
-splitTemplate conf =
- case break (==l) t of
- (le,_:re) -> case break (==r) re of
- (ce,_:ri) -> [le, ce, ri]
- _ -> def
- _ -> def
- where [l, r] = alignSep
- (if length (alignSep conf) == 2 then conf else defaultConfig)
- t = template conf
- def = [t, "", ""]
-
-
--- | Reads the configuration files or quits with an error
-readConfig :: FilePath -> IO (Config,[String])
-readConfig f = do
- file <- io $ fileExist f
- s <- io $ if file then readFileSafe f else error $
- f ++ ": file not found!\n" ++ usage
- either (\err -> error $ f ++
- ": configuration file contains errors at:\n" ++ show err)
- return $ parseConfig s
-
-xdgConfigDir :: IO String
-xdgConfigDir = do env <- getEnvironment
- case lookup "XDG_CONFIG_HOME" env of
- Just val -> return val
- Nothing -> fmap (</> ".config") getHomeDirectory
-
-xmobarConfigDir :: IO FilePath
-xmobarConfigDir = fmap (</> "xmobar") xdgConfigDir
-
-getXdgConfigFile :: IO FilePath
-getXdgConfigFile = fmap (</> "xmobarrc") xmobarConfigDir
-
--- | Read default configuration file or load the default config
-readDefaultConfig :: IO (Config,[String])
-readDefaultConfig = do
- xdgConfigFile <- getXdgConfigFile
- xdgConfigFileExists <- io $ fileExist xdgConfigFile
- home <- io $ getEnv "HOME"
- let defaultConfigFile = home ++ "/.xmobarrc"
- defaultConfigFileExists <- io $ fileExist defaultConfigFile
- if xdgConfigFileExists
- then readConfig xdgConfigFile
- else if defaultConfigFileExists
- then readConfig defaultConfigFile
- else return (defaultConfig,[])
-
-data Opts = Help
- | Version
- | Font String
- | BgColor String
- | FgColor String
- | Alpha String
- | T
- | B
- | D
- | AlignSep String
- | Commands String
- | AddCommand String
- | SepChar String
- | Template String
- | OnScr String
- | IconRoot String
- | Position String
- | WmClass String
- | WmName String
- deriving Show
-
-options :: [OptDescr Opts]
-options =
- [ Option "h?" ["help"] (NoArg Help) "This help"
- , Option "V" ["version"] (NoArg Version) "Show version information"
- , Option "f" ["font"] (ReqArg Font "font name") "The font name"
- , Option "w" ["wmclass"] (ReqArg WmClass "class") "X11 WM_CLASS property"
- , Option "n" ["wmname"] (ReqArg WmName "name") "X11 WM_NAME property"
- , Option "B" ["bgcolor"] (ReqArg BgColor "bg color" )
- "The background color. Default black"
- , Option "F" ["fgcolor"] (ReqArg FgColor "fg color")
- "The foreground color. Default grey"
- , Option "i" ["iconroot"] (ReqArg IconRoot "path")
- "Root directory for icon pattern paths. Default '.'"
- , Option "A" ["alpha"] (ReqArg Alpha "alpha")
- "The transparency: 0 is transparent, 255 is opaque. Default: 255"
- , Option "o" ["top"] (NoArg T) "Place xmobar at the top of the screen"
- , Option "b" ["bottom"] (NoArg B)
- "Place xmobar at the bottom of the screen"
- , Option "d" ["dock"] (NoArg D)
- "Don't override redirect from WM and function as a dock"
- , Option "a" ["alignsep"] (ReqArg AlignSep "alignsep")
- "Separators for left, center and right text\nalignment. Default: '}{'"
- , Option "s" ["sepchar"] (ReqArg SepChar "char")
- ("The character used to separate commands in" ++
- "\nthe output template. Default '%'")
- , Option "t" ["template"] (ReqArg Template "template")
- "The output template"
- , Option "c" ["commands"] (ReqArg Commands "commands")
- "The list of commands to be executed"
- , Option "C" ["add-command"] (ReqArg AddCommand "command")
- "Add to the list of commands to be executed"
- , Option "x" ["screen"] (ReqArg OnScr "screen")
- "On which X screen number to start"
- , Option "p" ["position"] (ReqArg Position "position")
- "Specify position of xmobar. Same syntax as in config file"
- ]
-
-getOpts :: [String] -> IO ([Opts], [String])
-getOpts argv =
- case getOpt Permute options argv of
- (o,n,[]) -> return (o,n)
- (_,_,errs) -> error (concat errs ++ usage)
-
-usage :: String
-usage = usageInfo header options ++ footer
- where header = "Usage: xmobar [OPTION...] [FILE]\nOptions:"
- footer = "\nMail bug reports and suggestions to " ++ mail ++ "\n"
-
-info :: String
-info = "xmobar " ++ showVersion version
- ++ "\n (C) 2007 - 2010 Andrea Rossato "
- ++ "\n (C) 2010 - 2018 Jose A Ortega Ruiz\n "
- ++ mail ++ "\n" ++ license
-
-mail :: String
-mail = "<mail@jao.io>"
-
-license :: String
-license = "\nThis program is distributed in the hope that it will be useful," ++
- "\nbut WITHOUT ANY WARRANTY; without even the implied warranty of" ++
- "\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++
- "\nSee the License for more details."
-
-doOpts :: Config -> [Opts] -> IO Config
-doOpts conf [] =
- return (conf {lowerOnStart = lowerOnStart conf && overrideRedirect conf})
-doOpts conf (o:oo) =
- case o of
- Help -> putStr usage >> exitSuccess
- Version -> putStrLn info >> exitSuccess
- Font s -> doOpts' (conf {font = s})
- WmClass s -> doOpts' (conf {wmClass = s})
- WmName s -> doOpts' (conf {wmName = s})
- BgColor s -> doOpts' (conf {bgColor = s})
- FgColor s -> doOpts' (conf {fgColor = s})
- Alpha n -> doOpts' (conf {alpha = read n})
- T -> doOpts' (conf {position = Top})
- B -> doOpts' (conf {position = Bottom})
- D -> doOpts' (conf {overrideRedirect = False})
- AlignSep s -> doOpts' (conf {alignSep = s})
- SepChar s -> doOpts' (conf {sepChar = s})
- Template s -> doOpts' (conf {template = s})
- IconRoot s -> doOpts' (conf {iconRoot = s})
- OnScr n -> doOpts' (conf {position = OnScreen (read n) $ position conf})
- Commands s -> case readCom 'c' s of
- Right x -> doOpts' (conf {commands = x})
- Left e -> putStr (e ++ usage) >> exitWith (ExitFailure 1)
- AddCommand s -> case readCom 'C' s of
- Right x -> doOpts' (conf {commands = commands conf ++ x})
- Left e -> putStr (e ++ usage) >> exitWith (ExitFailure 1)
- Position s -> readPosition s
- where readCom c str =
- case readStr str of
- [x] -> Right x
- _ -> Left ("xmobar: cannot read list of commands " ++
- "specified with the -" ++ c:" option\n")
- readStr str = [x | (x,t) <- reads str, ("","") <- lex t]
- doOpts' opts = doOpts opts oo
- readPosition string =
- case readMaybe string of
- Just x -> doOpts' (conf { position = x })
- Nothing -> do
- putStrLn "Can't parse position option, ignoring"
- doOpts' conf
diff --git a/src/Xmobar.hs b/src/Xmobar.hs
index 30ad11e..e4eb4b7 100644
--- a/src/Xmobar.hs
+++ b/src/Xmobar.hs
@@ -47,24 +47,24 @@ import Data.Bits
import Data.Map hiding (foldr, map, filter)
import Data.Maybe (fromJust, isJust)
-import Bitmap
-import Config
-import Parsers
-import Commands
-import Actions
-import Runnable
-import Signal
-import Window
-import XUtil
-import ColorCache
+import Xmobar.Bitmap as Bitmap
+import Xmobar.Config
+import Xmobar.Parsers
+import Xmobar.Commands
+import Xmobar.Actions
+import Xmobar.Runnable
+import Xmobar.Signal
+import Xmobar.Window
+import Xmobar.XUtil
+import Xmobar.ColorCache
#ifdef XFT
import Graphics.X11.Xft
-import MinXft (drawBackground)
+import Xmobar.MinXft (drawBackground)
#endif
#ifdef DBUS
-import IPC.DBus
+import Xmobar.IPC.DBus
#endif
-- $main
diff --git a/src/Actions.hs b/src/Xmobar/Actions.hs
index cd8ecb9..7901845 100644
--- a/src/Actions.hs
+++ b/src/Xmobar/Actions.hs
@@ -10,7 +10,7 @@
--
-----------------------------------------------------------------------------
-module Actions (Action(..), runAction, stripActions) where
+module Xmobar.Actions (Action(..), runAction, stripActions) where
import System.Process (system)
import Control.Monad (void)
diff --git a/src/Bitmap.hs b/src/Xmobar/Bitmap.hs
index 494c39c..314ce02 100644
--- a/src/Bitmap.hs
+++ b/src/Xmobar/Bitmap.hs
@@ -11,7 +11,7 @@
--
-----------------------------------------------------------------------------
-module Bitmap
+module Xmobar.Bitmap
( updateCache
, drawBitmap
, Bitmap(..)) where
@@ -23,12 +23,12 @@ import Graphics.X11.Xlib
import System.Directory (doesFileExist)
import System.FilePath ((</>))
import System.Mem.Weak ( addFinalizer )
-import ColorCache
-import Parsers (Widget(..))
-import Actions (Action)
+import Xmobar.ColorCache
+import Xmobar.Parsers (Widget(..))
+import Xmobar.Actions (Action)
#ifdef XPM
-import XPMFile(readXPMFile)
+import Xmobar.XPMFile(readXPMFile)
import Control.Applicative((<|>))
#endif
diff --git a/src/ColorCache.hs b/src/Xmobar/ColorCache.hs
index 3f8d7b4..f17aa0d 100644
--- a/src/ColorCache.hs
+++ b/src/Xmobar/ColorCache.hs
@@ -17,12 +17,12 @@
#if defined XFT
-module ColorCache(withColors, withDrawingColors) where
+module Xmobar.ColorCache(withColors, withDrawingColors) where
-import MinXft
+import Xmobar.MinXft
#else
-module ColorCache(withColors) where
+module Xmobar.ColorCache(withColors) where
#endif
diff --git a/src/Commands.hs b/src/Xmobar/Commands.hs
index 5b11ca3..ececdd9 100644
--- a/src/Commands.hs
+++ b/src/Xmobar/Commands.hs
@@ -17,7 +17,7 @@
--
-----------------------------------------------------------------------------
-module Commands
+module Xmobar.Commands
( Command (..)
, Exec (..)
, tenthSeconds
@@ -31,8 +31,8 @@ import System.Process
import System.Exit
import System.IO (hClose)
-import Signal
-import XUtil
+import Xmobar.Signal
+import Xmobar.XUtil
class Show e => Exec e where
alias :: e -> String
diff --git a/src/Config.hs b/src/Xmobar/Config.hs
index 43ddf51..21b29fa 100644
--- a/src/Config.hs
+++ b/src/Xmobar/Config.hs
@@ -14,7 +14,7 @@
--
-----------------------------------------------------------------------------
-module Config
+module Xmobar.Config
( -- * Configuration
-- $config
Config (..)
@@ -24,27 +24,27 @@ module Config
) where
-import Commands
-import {-# SOURCE #-} Runnable
-import Plugins.Monitors
-import Plugins.Date
-import Plugins.PipeReader
-import Plugins.BufferedPipeReader
-import Plugins.MarqueePipeReader
-import Plugins.CommandReader
-import Plugins.StdinReader
-import Plugins.XMonadLog
-import Plugins.EWMH
-import Plugins.Kbd
-import Plugins.Locks
+import Xmobar.Commands
+import {-# SOURCE #-} Xmobar.Runnable
+import Xmobar.Plugins.Monitors
+import Xmobar.Plugins.Date
+import Xmobar.Plugins.PipeReader
+import Xmobar.Plugins.BufferedPipeReader
+import Xmobar.Plugins.MarqueePipeReader
+import Xmobar.Plugins.CommandReader
+import Xmobar.Plugins.StdinReader
+import Xmobar.Plugins.XMonadLog
+import Xmobar.Plugins.EWMH
+import Xmobar.Plugins.Kbd
+import Xmobar.Plugins.Locks
#ifdef INOTIFY
-import Plugins.Mail
-import Plugins.MBox
+import Xmobar.Plugins.Mail
+import Xmobar.Plugins.MBox
#endif
#ifdef DATEZONE
-import Plugins.DateZone
+import Xmobar.Plugins.DateZone
#endif
-- $config
diff --git a/src/Environment.hs b/src/Xmobar/Environment.hs
index 1b7e48c..8a9223a 100644
--- a/src/Environment.hs
+++ b/src/Xmobar/Environment.hs
@@ -11,7 +11,7 @@
-- A function to expand environment variables in strings
--
-----------------------------------------------------------------------------
-module Environment(expandEnv) where
+module Xmobar.Environment(expandEnv) where
import Control.Applicative ((<$>))
import Data.Maybe (fromMaybe)
diff --git a/src/IPC/DBus.hs b/src/Xmobar/IPC/DBus.hs
index f6fdcb7..894637b 100644
--- a/src/IPC/DBus.hs
+++ b/src/Xmobar/IPC/DBus.hs
@@ -12,7 +12,7 @@
--
-----------------------------------------------------------------------------
-module IPC.DBus (runIPC) where
+module Xmobar.IPC.DBus (runIPC) where
import DBus
import DBus.Client hiding (interfaceName)
@@ -23,7 +23,7 @@ import Control.Exception (handle)
import System.IO (stderr, hPutStrLn)
import Control.Monad.IO.Class (liftIO)
-import Signal
+import Xmobar.Signal
busName :: BusName
busName = busName_ "org.Xmobar.Control"
diff --git a/src/Localize.hsc b/src/Xmobar/Localize.hsc
index 34d0fd9..984aa2b 100644
--- a/src/Localize.hsc
+++ b/src/Xmobar/Localize.hsc
@@ -13,7 +13,7 @@
--
-----------------------------------------------------------------------------
-module Localize
+module Xmobar.Localize
( setupTimeLocale,
getTimeLocale
) where
diff --git a/src/MinXft.hsc b/src/Xmobar/MinXft.hsc
index b64a8b8..0bf36c7 100644
--- a/src/MinXft.hsc
+++ b/src/Xmobar/MinXft.hsc
@@ -20,7 +20,7 @@
{-# LANGUAGE ForeignFunctionInterface, EmptyDataDecls #-}
-module MinXft ( AXftColor
+module Xmobar.MinXft ( AXftColor
, AXftDraw (..)
, AXftFont
, mallocAXftColor
diff --git a/src/Parsers.hs b/src/Xmobar/Parsers.hs
index 8d62968..d76f8f7 100644
--- a/src/Parsers.hs
+++ b/src/Xmobar/Parsers.hs
@@ -13,17 +13,17 @@
--
-----------------------------------------------------------------------------
-module Parsers
+module Xmobar.Parsers
( parseString
, parseTemplate
, parseConfig
, Widget(..)
) where
-import Config
-import Runnable
-import Commands
-import Actions
+import Xmobar.Config
+import Xmobar.Runnable
+import Xmobar.Commands
+import Xmobar.Actions
import Control.Monad (guard, mzero)
import qualified Data.Map as Map
diff --git a/src/Plugins.hs b/src/Xmobar/Plugins.hs
index 4255244..75ee306 100644
--- a/src/Plugins.hs
+++ b/src/Xmobar/Plugins.hs
@@ -14,12 +14,12 @@
--
-----------------------------------------------------------------------------
-module Plugins
+module Xmobar.Plugins
( Exec (..)
, tenthSeconds
, readFileSafe
, hGetLineSafe
) where
-import Commands
-import XUtil
+import Xmobar.Commands
+import Xmobar.XUtil
diff --git a/src/Plugins/BufferedPipeReader.hs b/src/Xmobar/Plugins/BufferedPipeReader.hs
index fb7d269..d4d30a1 100644
--- a/src/Plugins/BufferedPipeReader.hs
+++ b/src/Xmobar/Plugins/BufferedPipeReader.hs
@@ -12,7 +12,7 @@
--
-----------------------------------------------------------------------------
-module Plugins.BufferedPipeReader where
+module Xmobar.Plugins.BufferedPipeReader where
import Control.Monad(forM_, when, void)
import Control.Concurrent
@@ -20,9 +20,9 @@ import Control.Concurrent.STM
import System.IO
import System.IO.Unsafe(unsafePerformIO)
-import Environment
-import Plugins
-import Signal
+import Xmobar.Environment
+import Xmobar.Plugins
+import Xmobar.Signal
data BufferedPipeReader = BufferedPipeReader String [(Int, Bool, String)]
deriving (Read, Show)
diff --git a/src/Plugins/CommandReader.hs b/src/Xmobar/Plugins/CommandReader.hs
index 7c7c92d..80b6299 100644
--- a/src/Plugins/CommandReader.hs
+++ b/src/Xmobar/Plugins/CommandReader.hs
@@ -13,10 +13,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.CommandReader where
+module Xmobar.Plugins.CommandReader where
import System.IO
-import Plugins
+import Xmobar.Plugins
import System.Process(runInteractiveCommand, getProcessExitCode)
data CommandReader = CommandReader String String
diff --git a/src/Plugins/Date.hs b/src/Xmobar/Plugins/Date.hs
index b2d32da..fdc6a56 100644
--- a/src/Plugins/Date.hs
+++ b/src/Xmobar/Plugins/Date.hs
@@ -17,9 +17,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Date (Date(..)) where
+module Xmobar.Plugins.Date (Date(..)) where
-import Plugins
+import Xmobar.Plugins
#if ! MIN_VERSION_time(1,5,0)
import System.Locale
diff --git a/src/Plugins/DateZone.hs b/src/Xmobar/Plugins/DateZone.hs
index 401e77c..753f530 100644
--- a/src/Plugins/DateZone.hs
+++ b/src/Xmobar/Plugins/DateZone.hs
@@ -20,9 +20,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.DateZone (DateZone(..)) where
+module Xmobar.Plugins.DateZone (DateZone(..)) where
-import Plugins
+import Xmobar.Plugins
#ifdef DATEZONE
@@ -30,7 +30,7 @@ import Control.Concurrent.STM
import System.IO.Unsafe
-import Localize
+import Xmobar.Localize
import Data.Time.Format
import Data.Time.LocalTime
import Data.Time.LocalTime.TimeZone.Olson
@@ -41,7 +41,7 @@ import System.Locale (TimeLocale)
#endif
#else
import System.IO
-import Plugins.Date
+import Xmobar.Plugins.Date
#endif
diff --git a/src/Plugins/EWMH.hs b/src/Xmobar/Plugins/EWMH.hs
index 1aac83d..363ec90 100644
--- a/src/Plugins/EWMH.hs
+++ b/src/Xmobar/Plugins/EWMH.hs
@@ -15,21 +15,21 @@
--
-----------------------------------------------------------------------------
-module Plugins.EWMH (EWMH(..)) where
+module Xmobar.Plugins.EWMH (EWMH(..)) where
import Control.Applicative (Applicative(..))
import Control.Monad.State
import Control.Monad.Reader
import Graphics.X11 hiding (Modifier, Color)
import Graphics.X11.Xlib.Extras
-import Plugins
+import Xmobar.Plugins
#ifdef UTF8
#undef UTF8
import Codec.Binary.UTF8.String as UTF8
#define UTF8
#endif
import Foreign.C (CChar, CLong)
-import XUtil (nextEvent')
+import Xmobar.XUtil (nextEvent')
import Data.List (intersperse, intercalate)
diff --git a/src/Plugins/Kbd.hsc b/src/Xmobar/Plugins/Kbd.hsc
index a4bb90d..763150b 100644
--- a/src/Plugins/Kbd.hsc
+++ b/src/Xmobar/Plugins/Kbd.hsc
@@ -13,16 +13,16 @@
--
-----------------------------------------------------------------------------
-module Plugins.Kbd where
+module Xmobar.Plugins.Kbd where
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import Foreign
import Foreign.C.Types
import Foreign.C.String
-import Plugins
+import Xmobar.Plugins
import Control.Monad (forever)
-import XUtil (nextEvent')
+import Xmobar.XUtil (nextEvent')
import Data.List (isPrefixOf, findIndex)
import Data.Maybe (fromJust)
diff --git a/src/Plugins/Locks.hs b/src/Xmobar/Plugins/Locks.hs
index 79b1583..9a971e5 100644
--- a/src/Plugins/Locks.hs
+++ b/src/Xmobar/Plugins/Locks.hs
@@ -12,16 +12,16 @@
--
-----------------------------------------------------------------------------
-module Plugins.Locks where
+module Xmobar.Plugins.Locks where
import Graphics.X11
import Data.List
import Data.Bits
import Control.Monad
import Graphics.X11.Xlib.Extras
-import Plugins
-import Plugins.Kbd
-import XUtil (nextEvent')
+import Xmobar.Plugins
+import Xmobar.Plugins.Kbd
+import Xmobar.XUtil (nextEvent')
data Locks = Locks
deriving (Read, Show)
diff --git a/src/Plugins/MBox.hs b/src/Xmobar/Plugins/MBox.hs
index 48a6228..2281629 100644
--- a/src/Plugins/MBox.hs
+++ b/src/Xmobar/Plugins/MBox.hs
@@ -13,12 +13,12 @@
--
-----------------------------------------------------------------------------
-module Plugins.MBox (MBox(..)) where
+module Xmobar.Plugins.MBox (MBox(..)) where
import Prelude
-import Plugins
+import Xmobar.Plugins
#ifdef INOTIFY
-import Plugins.Utils (changeLoop, expandHome)
+import Xmobar.Plugins.Utils (changeLoop, expandHome)
import Control.Monad (when)
import Control.Concurrent.STM
diff --git a/src/Plugins/Mail.hs b/src/Xmobar/Plugins/Mail.hs
index 538bcf7..c41b5b3 100644
--- a/src/Plugins/Mail.hs
+++ b/src/Xmobar/Plugins/Mail.hs
@@ -13,11 +13,11 @@
--
-----------------------------------------------------------------------------
-module Plugins.Mail where
+module Xmobar.Plugins.Mail where
-import Plugins
+import Xmobar.Plugins
#ifdef INOTIFY
-import Plugins.Utils (expandHome, changeLoop)
+import Xmobar.Plugins.Utils (expandHome, changeLoop)
import Control.Monad
import Control.Concurrent.STM
diff --git a/src/Plugins/MarqueePipeReader.hs b/src/Xmobar/Plugins/MarqueePipeReader.hs
index c46fff4..ad6f27f 100644
--- a/src/Plugins/MarqueePipeReader.hs
+++ b/src/Xmobar/Plugins/MarqueePipeReader.hs
@@ -12,11 +12,11 @@
--
-----------------------------------------------------------------------------
-module Plugins.MarqueePipeReader where
+module Xmobar.Plugins.MarqueePipeReader where
import System.IO (openFile, IOMode(ReadWriteMode), Handle)
-import Environment
-import Plugins (tenthSeconds, Exec(alias, start), hGetLineSafe)
+import Xmobar.Environment
+import Xmobar.Plugins (tenthSeconds, Exec(alias, start), hGetLineSafe)
import System.Posix.Files (getFileStatus, isNamedPipe)
import Control.Concurrent(forkIO, threadDelay)
import Control.Concurrent.STM (TChan, atomically, writeTChan, tryReadTChan, newTChan)
diff --git a/src/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs
index 08fd098..64d38f0 100644
--- a/src/Plugins/Monitors.hs
+++ b/src/Xmobar/Plugins/Monitors.hs
@@ -3,7 +3,7 @@
-----------------------------------------------------------------------------
-- |
-- Module : Xmobar.Plugins.Monitors
--- Copyright : (c) 2010, 2011, 2012, 2013, 2017 Jose Antonio Ortega Ruiz
+-- Copyright : (c) 2010, 2011, 2012, 2013, 2017, 2018 Jose Antonio Ortega Ruiz
-- (c) 2007-10 Andrea Rossato
-- License : BSD-style (see LICENSE)
--
@@ -15,45 +15,45 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors where
+module Xmobar.Plugins.Monitors where
-import Plugins
+import Xmobar.Plugins
-import Plugins.Monitors.Common (runM, runMD)
+import Xmobar.Plugins.Monitors.Common (runM, runMD)
#ifdef WEATHER
-import Plugins.Monitors.Weather
-#endif
-import Plugins.Monitors.Net
-import Plugins.Monitors.Mem
-import Plugins.Monitors.Swap
-import Plugins.Monitors.Cpu
-import Plugins.Monitors.MultiCpu
-import Plugins.Monitors.Batt
-import Plugins.Monitors.Bright
-import Plugins.Monitors.Thermal
-import Plugins.Monitors.ThermalZone
-import Plugins.Monitors.CpuFreq
-import Plugins.Monitors.CoreTemp
-import Plugins.Monitors.Disk
-import Plugins.Monitors.Top
-import Plugins.Monitors.Uptime
-import Plugins.Monitors.CatInt
+import Xmobar.Plugins.Monitors.Weather
+#endif
+import Xmobar.Plugins.Monitors.Net
+import Xmobar.Plugins.Monitors.Mem
+import Xmobar.Plugins.Monitors.Swap
+import Xmobar.Plugins.Monitors.Cpu
+import Xmobar.Plugins.Monitors.MultiCpu
+import Xmobar.Plugins.Monitors.Batt
+import Xmobar.Plugins.Monitors.Bright
+import Xmobar.Plugins.Monitors.Thermal
+import Xmobar.Plugins.Monitors.ThermalZone
+import Xmobar.Plugins.Monitors.CpuFreq
+import Xmobar.Plugins.Monitors.CoreTemp
+import Xmobar.Plugins.Monitors.Disk
+import Xmobar.Plugins.Monitors.Top
+import Xmobar.Plugins.Monitors.Uptime
+import Xmobar.Plugins.Monitors.CatInt
#ifdef UVMETER
-import Plugins.Monitors.UVMeter
+import Xmobar.Plugins.Monitors.UVMeter
#endif
#ifdef IWLIB
-import Plugins.Monitors.Wireless
+import Xmobar.Plugins.Monitors.Wireless
#endif
#ifdef LIBMPD
-import Plugins.Monitors.MPD
-import Plugins.Monitors.Common (runMBD)
+import Xmobar.Plugins.Monitors.MPD
+import Xmobar.Plugins.Monitors.Common (runMBD)
#endif
#ifdef ALSA
-import Plugins.Monitors.Volume
-import Plugins.Monitors.Alsa
+import Xmobar.Plugins.Monitors.Volume
+import Xmobar.Plugins.Monitors.Alsa
#endif
#ifdef MPRIS
-import Plugins.Monitors.Mpris
+import Xmobar.Plugins.Monitors.Mpris
#endif
data Monitors = Network Interface Args Rate
diff --git a/src/Plugins/Monitors/Batt.hs b/src/Xmobar/Plugins/Monitors/Batt.hs
index eeeb049..80f4275 100644
--- a/src/Plugins/Monitors/Batt.hs
+++ b/src/Xmobar/Plugins/Monitors/Batt.hs
@@ -13,10 +13,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Batt ( battConfig, runBatt, runBatt' ) where
+module Xmobar.Plugins.Monitors.Batt ( battConfig, runBatt, runBatt' ) where
import Control.Exception (SomeException, handle)
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import System.FilePath ((</>))
import System.IO (IOMode(ReadMode), hGetLine, withFile)
import System.Posix.Files (fileExist)
diff --git a/src/Plugins/Monitors/Bright.hs b/src/Xmobar/Plugins/Monitors/Bright.hs
index cb510f6..fe72219 100644
--- a/src/Plugins/Monitors/Bright.hs
+++ b/src/Xmobar/Plugins/Monitors/Bright.hs
@@ -12,7 +12,7 @@
----
-------------------------------------------------------------------------------
-module Plugins.Monitors.Bright (brightConfig, runBright) where
+module Xmobar.Plugins.Monitors.Bright (brightConfig, runBright) where
import Control.Applicative ((<$>))
import Control.Exception (SomeException, handle)
@@ -21,7 +21,7 @@ import System.FilePath ((</>))
import System.Posix.Files (fileExist)
import System.Console.GetOpt
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
data BrightOpts = BrightOpts { subDir :: String
, currBright :: String
diff --git a/src/Plugins/Monitors/CatInt.hs b/src/Xmobar/Plugins/Monitors/CatInt.hs
index aacbd71..781eded 100644
--- a/src/Plugins/Monitors/CatInt.hs
+++ b/src/Xmobar/Plugins/Monitors/CatInt.hs
@@ -10,10 +10,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.CatInt where
+module Xmobar.Plugins.Monitors.CatInt where
-import Plugins.Monitors.Common
-import Plugins.Monitors.CoreCommon
+import Xmobar.Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.CoreCommon
catIntConfig :: IO MConfig
catIntConfig = mkMConfig "<v>" ["v"]
diff --git a/src/Plugins/Monitors/Common.hs b/src/Xmobar/Plugins/Monitors/Common.hs
index 782a18f..272690b 100644
--- a/src/Plugins/Monitors/Common.hs
+++ b/src/Xmobar/Plugins/Monitors/Common.hs
@@ -13,7 +13,7 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Common (
+module Xmobar.Plugins.Monitors.Common (
-- * Monitors
-- $monitor
Monitor
@@ -76,7 +76,7 @@ import Text.ParserCombinators.Parsec
import System.Console.GetOpt
import Control.Exception (SomeException,handle)
-import Plugins
+import Xmobar.Plugins
-- $monitor
type Monitor a = ReaderT MConfig IO a
diff --git a/src/Plugins/Monitors/CoreCommon.hs b/src/Xmobar/Plugins/Monitors/CoreCommon.hs
index 6298421..a84198e 100644
--- a/src/Plugins/Monitors/CoreCommon.hs
+++ b/src/Xmobar/Plugins/Monitors/CoreCommon.hs
@@ -14,7 +14,7 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.CoreCommon where
+module Xmobar.Plugins.Monitors.CoreCommon where
#if __GLASGOW_HASKELL__ < 800
import Control.Applicative
@@ -24,7 +24,7 @@ import Data.Char hiding (Space)
import Data.Function
import Data.List
import Data.Maybe
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import System.Directory
checkedDataRetrieval :: (Ord a, Num a)
diff --git a/src/Plugins/Monitors/CoreTemp.hs b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
index e19baf0..48fe428 100644
--- a/src/Plugins/Monitors/CoreTemp.hs
+++ b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
@@ -12,10 +12,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.CoreTemp where
+module Xmobar.Plugins.Monitors.CoreTemp where
-import Plugins.Monitors.Common
-import Plugins.Monitors.CoreCommon
+import Xmobar.Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.CoreCommon
import Data.Char (isDigit)
diff --git a/src/Plugins/Monitors/Cpu.hs b/src/Xmobar/Plugins/Monitors/Cpu.hs
index 0dba92a..6befe7d 100644
--- a/src/Plugins/Monitors/Cpu.hs
+++ b/src/Xmobar/Plugins/Monitors/Cpu.hs
@@ -13,9 +13,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Cpu (startCpu) where
+module Xmobar.Plugins.Monitors.Cpu (startCpu) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Data.ByteString.Lazy.Char8 as B
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
import System.Console.GetOpt
diff --git a/src/Plugins/Monitors/CpuFreq.hs b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
index 34240ee..1afedfa 100644
--- a/src/Plugins/Monitors/CpuFreq.hs
+++ b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
@@ -12,10 +12,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.CpuFreq where
+module Xmobar.Plugins.Monitors.CpuFreq where
-import Plugins.Monitors.Common
-import Plugins.Monitors.CoreCommon
+import Xmobar.Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.CoreCommon
-- |
-- Cpu frequency default configuration. Default template contains only
diff --git a/src/Plugins/Monitors/Disk.hs b/src/Xmobar/Plugins/Monitors/Disk.hs
index 0019c1a..aedad75 100644
--- a/src/Plugins/Monitors/Disk.hs
+++ b/src/Xmobar/Plugins/Monitors/Disk.hs
@@ -12,10 +12,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Disk (diskUConfig, runDiskU, startDiskIO) where
+module Xmobar.Plugins.Monitors.Disk (diskUConfig, runDiskU, startDiskIO) where
-import Plugins.Monitors.Common
-import StatFS
+import Xmobar.Plugins.Monitors.Common
+import Xmobar.StatFS
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
diff --git a/src/Plugins/Monitors/MPD.hs b/src/Xmobar/Plugins/Monitors/MPD.hs
index 0676e64..9525254 100644
--- a/src/Plugins/Monitors/MPD.hs
+++ b/src/Xmobar/Plugins/Monitors/MPD.hs
@@ -12,11 +12,11 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.MPD ( mpdConfig, runMPD, mpdWait, mpdReady ) where
+module Xmobar.Plugins.Monitors.MPD ( mpdConfig, runMPD, mpdWait, mpdReady ) where
import Data.List
import Data.Maybe (fromMaybe)
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import System.Console.GetOpt
import qualified Network.MPD as M
import Control.Concurrent (threadDelay)
diff --git a/src/Plugins/Monitors/Mem.hs b/src/Xmobar/Plugins/Monitors/Mem.hs
index 403fa43..d69921b 100644
--- a/src/Plugins/Monitors/Mem.hs
+++ b/src/Xmobar/Plugins/Monitors/Mem.hs
@@ -12,9 +12,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Mem (memConfig, runMem, totalMem, usedMem) where
+module Xmobar.Plugins.Monitors.Mem (memConfig, runMem, totalMem, usedMem) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Data.Map as M
import System.Console.GetOpt
diff --git a/src/Plugins/Monitors/Mpris.hs b/src/Xmobar/Plugins/Monitors/Mpris.hs
index ed76dc9..3556649 100644
--- a/src/Plugins/Monitors/Mpris.hs
+++ b/src/Xmobar/Plugins/Monitors/Mpris.hs
@@ -14,11 +14,11 @@
--
----------------------------------------------------------------------------
-module Plugins.Monitors.Mpris ( mprisConfig, runMPRIS1, runMPRIS2 ) where
+module Xmobar.Plugins.Monitors.Mpris ( mprisConfig, runMPRIS1, runMPRIS2 ) where
-- TODO: listen to signals
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Text.Printf (printf)
diff --git a/src/Plugins/Monitors/MultiCpu.hs b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
index 1477cf6..3db3b5f 100644
--- a/src/Plugins/Monitors/MultiCpu.hs
+++ b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
@@ -12,9 +12,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.MultiCpu (startMultiCpu) where
+module Xmobar.Plugins.Monitors.MultiCpu (startMultiCpu) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Control.Applicative ((<$>))
import qualified Data.ByteString.Lazy.Char8 as B
import Data.List (isPrefixOf, transpose, unfoldr)
diff --git a/src/Plugins/Monitors/Net.hs b/src/Xmobar/Plugins/Monitors/Net.hs
index 9819fe2..81a5f6b 100644
--- a/src/Plugins/Monitors/Net.hs
+++ b/src/Xmobar/Plugins/Monitors/Net.hs
@@ -13,12 +13,12 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Net (
+module Xmobar.Plugins.Monitors.Net (
startNet
, startDynNet
) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Data.Word (Word64)
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
diff --git a/src/Plugins/Monitors/Swap.hs b/src/Xmobar/Plugins/Monitors/Swap.hs
index b6c5019..fcaab84 100644
--- a/src/Plugins/Monitors/Swap.hs
+++ b/src/Xmobar/Plugins/Monitors/Swap.hs
@@ -12,9 +12,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Swap where
+module Xmobar.Plugins.Monitors.Swap where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Data.ByteString.Lazy.Char8 as B
diff --git a/src/Plugins/Monitors/Thermal.hs b/src/Xmobar/Plugins/Monitors/Thermal.hs
index 5a97152..320ae17 100644
--- a/src/Plugins/Monitors/Thermal.hs
+++ b/src/Xmobar/Plugins/Monitors/Thermal.hs
@@ -12,10 +12,10 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Thermal where
+module Xmobar.Plugins.Monitors.Thermal where
import qualified Data.ByteString.Lazy.Char8 as B
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import System.Posix.Files (fileExist)
-- | Default thermal configuration.
diff --git a/src/Plugins/Monitors/ThermalZone.hs b/src/Xmobar/Plugins/Monitors/ThermalZone.hs
index a4744b4..bc46b59 100644
--- a/src/Plugins/Monitors/ThermalZone.hs
+++ b/src/Xmobar/Plugins/Monitors/ThermalZone.hs
@@ -15,9 +15,9 @@
--
------------------------------------------------------------------------------
-module Plugins.Monitors.ThermalZone (thermalZoneConfig, runThermalZone) where
+module Xmobar.Plugins.Monitors.ThermalZone (thermalZoneConfig, runThermalZone) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import System.Posix.Files (fileExist)
import Control.Exception (IOException, catch)
diff --git a/src/Plugins/Monitors/Top.hs b/src/Xmobar/Plugins/Monitors/Top.hs
index 41a68b2..d6df249 100644
--- a/src/Plugins/Monitors/Top.hs
+++ b/src/Xmobar/Plugins/Monitors/Top.hs
@@ -15,9 +15,9 @@
{-# LANGUAGE ForeignFunctionInterface #-}
{-# LANGUAGE BangPatterns #-}
-module Plugins.Monitors.Top (startTop, topMemConfig, runTopMem) where
+module Xmobar.Plugins.Monitors.Top (startTop, topMemConfig, runTopMem) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Control.Exception (SomeException, handle)
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
diff --git a/src/Plugins/Monitors/UVMeter.hs b/src/Xmobar/Plugins/Monitors/UVMeter.hs
index 4d90846..079177f 100644
--- a/src/Plugins/Monitors/UVMeter.hs
+++ b/src/Xmobar/Plugins/Monitors/UVMeter.hs
@@ -13,9 +13,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.UVMeter where
+module Xmobar.Plugins.Monitors.UVMeter where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Control.Exception as CE
import Network.HTTP.Conduit
diff --git a/src/Plugins/Monitors/Uptime.hs b/src/Xmobar/Plugins/Monitors/Uptime.hs
index 8524bcc..235fc85 100644
--- a/src/Plugins/Monitors/Uptime.hs
+++ b/src/Xmobar/Plugins/Monitors/Uptime.hs
@@ -15,9 +15,9 @@
------------------------------------------------------------------------------
-module Plugins.Monitors.Uptime (uptimeConfig, runUptime) where
+module Xmobar.Plugins.Monitors.Uptime (uptimeConfig, runUptime) where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Data.ByteString.Lazy.Char8 as B
diff --git a/src/Plugins/Monitors/Volume.hs b/src/Xmobar/Plugins/Monitors/Volume.hs
index 0023d41..1d3281c 100644
--- a/src/Plugins/Monitors/Volume.hs
+++ b/src/Xmobar/Plugins/Monitors/Volume.hs
@@ -1,7 +1,7 @@
-----------------------------------------------------------------------------
-- |
-- Module : Plugins.Monitors.Volume
--- Copyright : (c) 2011, 2013, 2015 Thomas Tuegel
+-- Copyright : (c) 2011, 2013, 2015, 2018 Thomas Tuegel
-- License : BSD-style (see LICENSE)
--
-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org>
@@ -12,7 +12,7 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Volume
+module Xmobar.Plugins.Monitors.Volume
( runVolume
, runVolumeWith
, volumeConfig
@@ -24,7 +24,7 @@ module Plugins.Monitors.Volume
import Control.Applicative ((<$>))
import Control.Monad ( liftM2, liftM3, mplus )
import Data.Traversable (sequenceA)
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Sound.ALSA.Mixer
import qualified Sound.ALSA.Exception as AE
import System.Console.GetOpt
diff --git a/src/Plugins/Monitors/Weather.hs b/src/Xmobar/Plugins/Monitors/Weather.hs
index cd1b4eb..cb5bf07 100644
--- a/src/Plugins/Monitors/Weather.hs
+++ b/src/Xmobar/Plugins/Monitors/Weather.hs
@@ -13,9 +13,9 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Weather where
+module Xmobar.Plugins.Monitors.Weather where
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import qualified Control.Exception as CE
diff --git a/src/Plugins/Monitors/Wireless.hs b/src/Xmobar/Plugins/Monitors/Wireless.hs
index 9397e50..545f6bc 100644
--- a/src/Plugins/Monitors/Wireless.hs
+++ b/src/Xmobar/Plugins/Monitors/Wireless.hs
@@ -12,11 +12,11 @@
--
-----------------------------------------------------------------------------
-module Plugins.Monitors.Wireless (wirelessConfig, runWireless) where
+module Xmobar.Plugins.Monitors.Wireless (wirelessConfig, runWireless) where
import System.Console.GetOpt
-import Plugins.Monitors.Common
+import Xmobar.Plugins.Monitors.Common
import Network.IWlib
newtype WirelessOpts = WirelessOpts
diff --git a/src/Plugins/PipeReader.hs b/src/Xmobar/Plugins/PipeReader.hs
index b3e178d..7166163 100644
--- a/src/Plugins/PipeReader.hs
+++ b/src/Xmobar/Plugins/PipeReader.hs
@@ -12,11 +12,11 @@
--
-----------------------------------------------------------------------------
-module Plugins.PipeReader where
+module Xmobar.Plugins.PipeReader where
import System.IO
-import Plugins
-import Environment
+import Xmobar.Plugins
+import Xmobar.Environment
import System.Posix.Files
import Control.Concurrent(threadDelay)
import Control.Exception
diff --git a/src/Plugins/StdinReader.hs b/src/Xmobar/Plugins/StdinReader.hs
index 31d041e..372e4f9 100644
--- a/src/Plugins/StdinReader.hs
+++ b/src/Xmobar/Plugins/StdinReader.hs
@@ -16,15 +16,15 @@
--
-----------------------------------------------------------------------------
-module Plugins.StdinReader (StdinReader(..)) where
+module Xmobar.Plugins.StdinReader (StdinReader(..)) where
import Prelude
import System.Posix.Process
import System.Exit
import System.IO
import Control.Exception (SomeException(..), handle)
-import Plugins
-import Actions (stripActions)
+import Xmobar.Plugins
+import Xmobar.Actions (stripActions)
data StdinReader = StdinReader | UnsafeStdinReader
deriving (Read, Show)
diff --git a/src/Plugins/Utils.hs b/src/Xmobar/Plugins/Utils.hs
index bbfa84f..6546c15 100644
--- a/src/Plugins/Utils.hs
+++ b/src/Xmobar/Plugins/Utils.hs
@@ -15,7 +15,7 @@
------------------------------------------------------------------------------
-module Plugins.Utils (expandHome, changeLoop, safeHead) where
+module Xmobar.Plugins.Utils (expandHome, changeLoop, safeHead) where
import Control.Monad
import Control.Concurrent.STM
diff --git a/src/Plugins/XMonadLog.hs b/src/Xmobar/Plugins/XMonadLog.hs
index 158b7ef..6bbba59 100644
--- a/src/Plugins/XMonadLog.hs
+++ b/src/Xmobar/Plugins/XMonadLog.hs
@@ -15,20 +15,20 @@
--
-----------------------------------------------------------------------------
-module Plugins.XMonadLog (XMonadLog(..)) where
+module Xmobar.Plugins.XMonadLog (XMonadLog(..)) where
import Control.Monad
import Graphics.X11
import Graphics.X11.Xlib.Extras
-import Plugins
+import Xmobar.Plugins
#ifdef UTF8
#undef UTF8
import Codec.Binary.UTF8.String as UTF8
#define UTF8
#endif
import Foreign.C (CChar)
-import XUtil (nextEvent')
-import Actions (stripActions)
+import Xmobar.XUtil (nextEvent')
+import Xmobar.Actions (stripActions)
data XMonadLog = XMonadLog
| UnsafeXMonadLog
diff --git a/src/Runnable.hs b/src/Xmobar/Runnable.hs
index 04272f5..164f661 100644
--- a/src/Runnable.hs
+++ b/src/Xmobar/Runnable.hs
@@ -19,12 +19,12 @@
--
-----------------------------------------------------------------------------
-module Runnable where
+module Xmobar.Runnable where
import Control.Monad
import Text.Read
-import Config (runnableTypes)
-import Commands
+import Xmobar.Config (runnableTypes)
+import Xmobar.Commands
data Runnable = forall r . (Exec r, Read r, Show r) => Run r
diff --git a/src/Runnable.hs-boot b/src/Xmobar/Runnable.hs-boot
index eba90e6..0f67322 100644
--- a/src/Runnable.hs-boot
+++ b/src/Xmobar/Runnable.hs-boot
@@ -1,6 +1,6 @@
{-# LANGUAGE ExistentialQuantification #-}
-module Runnable where
-import Commands
+module Xmobar.Runnable where
+import Xmobar.Commands
data Runnable = forall r . (Exec r,Read r,Show r) => Run r
diff --git a/src/Signal.hs b/src/Xmobar/Signal.hs
index 74e40e9..bdc4be1 100644
--- a/src/Signal.hs
+++ b/src/Xmobar/Signal.hs
@@ -16,7 +16,7 @@
--
-----------------------------------------------------------------------------
-module Signal where
+module Xmobar.Signal where
import Data.Foldable (for_)
import Data.Typeable (Typeable)
@@ -33,7 +33,7 @@ import DBus (IsVariant(..))
import Control.Monad ((>=>))
#endif
-import Plugins.Utils (safeHead)
+import Xmobar.Plugins.Utils (safeHead)
data WakeUp = WakeUp deriving (Show,Typeable)
instance Exception WakeUp
diff --git a/src/StatFS.hsc b/src/Xmobar/StatFS.hsc
index a9046c1..25de0df 100644
--- a/src/StatFS.hsc
+++ b/src/Xmobar/StatFS.hsc
@@ -15,7 +15,7 @@
{-# LANGUAGE CPP, ForeignFunctionInterface, EmptyDataDecls #-}
-module StatFS ( FileSystemStats(..), getFileSystemStats ) where
+module Xmobar.StatFS ( FileSystemStats(..), getFileSystemStats ) where
import Foreign
import Foreign.C.Types
diff --git a/src/Window.hs b/src/Xmobar/Window.hs
index 829ab8d..c8228de 100644
--- a/src/Window.hs
+++ b/src/Xmobar/Window.hs
@@ -13,7 +13,7 @@
--
-----------------------------------------------------------------------------
-module Window where
+module Xmobar.Window where
import Prelude
import Control.Applicative ((<$>))
@@ -28,8 +28,8 @@ import Data.List (maximumBy)
import Data.Maybe (fromMaybe)
import System.Posix.Process (getProcessID)
-import Config
-import XUtil
+import Xmobar.Config
+import Xmobar.XUtil
-- $window
diff --git a/src/XPMFile.hsc b/src/Xmobar/XPMFile.hsc
index f10449b..03d534f 100644
--- a/src/XPMFile.hsc
+++ b/src/Xmobar/XPMFile.hsc
@@ -11,7 +11,7 @@
--
-----------------------------------------------------------------------------
-module XPMFile(readXPMFile) where
+module Xmobar.XPMFile(readXPMFile) where
#if MIN_VERSION_mtl(2, 2, 1)
import Control.Monad.Except(MonadError(..))
diff --git a/src/XUtil.hsc b/src/Xmobar/XUtil.hsc
index dcca342..05e6fad 100644
--- a/src/XUtil.hsc
+++ b/src/Xmobar/XUtil.hsc
@@ -11,7 +11,7 @@
--
-----------------------------------------------------------------------------
-module XUtil
+module Xmobar.XUtil
( XFont
, initFont
, initCoreFont
@@ -48,11 +48,11 @@ import qualified System.IO as UTF8 (readFile,hGetLine)
# endif
#endif
#if defined XFT
-import MinXft
+import Xmobar.MinXft
import Graphics.X11.Xrender
#endif
-import ColorCache
+import Xmobar.ColorCache
readFileSafe :: FilePath -> IO String
#if defined XFT || defined UTF8