From 24c84e47177b6ebbe3df99db53220def6c0951ec Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 25 Nov 2018 23:43:41 +0000
Subject: Xmobar.System.Utils, Xmobar.X11.Events

---
 src/Xmobar/Plugins/BufferedPipeReader.hs | 2 +-
 src/Xmobar/Plugins/CommandReader.hs      | 2 +-
 src/Xmobar/Plugins/DateZone.hs           | 1 -
 src/Xmobar/Plugins/EWMH.hs               | 2 +-
 src/Xmobar/Plugins/Kbd.hs                | 2 +-
 src/Xmobar/Plugins/Locks.hs              | 2 +-
 src/Xmobar/Plugins/MBox.hs               | 3 ++-
 src/Xmobar/Plugins/Mail.hs               | 3 ++-
 src/Xmobar/Plugins/MarqueePipeReader.hs  | 4 ++--
 src/Xmobar/Plugins/Monitors/Common.hs    | 2 +-
 src/Xmobar/Plugins/PipeReader.hs         | 2 +-
 src/Xmobar/Plugins/StdinReader.hs        | 4 ++--
 src/Xmobar/Plugins/XMonadLog.hs          | 2 +-
 13 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/Xmobar/Plugins')

diff --git a/src/Xmobar/Plugins/BufferedPipeReader.hs b/src/Xmobar/Plugins/BufferedPipeReader.hs
index 65ecea2..ee02355 100644
--- a/src/Xmobar/Plugins/BufferedPipeReader.hs
+++ b/src/Xmobar/Plugins/BufferedPipeReader.hs
@@ -20,10 +20,10 @@ import Control.Concurrent.STM
 import System.IO
 import System.IO.Unsafe(unsafePerformIO)
 
-import Xmobar.Utils(hGetLineSafe)
 import Xmobar.Run.Commands
 import Xmobar.System.Signal
 import Xmobar.System.Environment
+import Xmobar.System.Utils(hGetLineSafe)
 
 data BufferedPipeReader = BufferedPipeReader String [(Int, Bool, String)]
     deriving (Read, Show)
diff --git a/src/Xmobar/Plugins/CommandReader.hs b/src/Xmobar/Plugins/CommandReader.hs
index 69c8e0c..4e39d72 100644
--- a/src/Xmobar/Plugins/CommandReader.hs
+++ b/src/Xmobar/Plugins/CommandReader.hs
@@ -17,7 +17,7 @@ module Xmobar.Plugins.CommandReader(CommandReader(..)) where
 
 import System.IO
 import Xmobar.Run.Commands
-import Xmobar.Utils (hGetLineSafe)
+import Xmobar.System.Utils (hGetLineSafe)
 import System.Process(runInteractiveCommand, getProcessExitCode)
 
 data CommandReader = CommandReader String String
diff --git a/src/Xmobar/Plugins/DateZone.hs b/src/Xmobar/Plugins/DateZone.hs
index 7215713..c2e80da 100644
--- a/src/Xmobar/Plugins/DateZone.hs
+++ b/src/Xmobar/Plugins/DateZone.hs
@@ -23,7 +23,6 @@
 module Xmobar.Plugins.DateZone (DateZone(..)) where
 
 import Xmobar.Run.Commands
-import Xmobar.Utils(tenthSeconds)
 
 #ifdef DATEZONE
 import Control.Concurrent.STM
diff --git a/src/Xmobar/Plugins/EWMH.hs b/src/Xmobar/Plugins/EWMH.hs
index 4a443d6..5b68620 100644
--- a/src/Xmobar/Plugins/EWMH.hs
+++ b/src/Xmobar/Plugins/EWMH.hs
@@ -29,7 +29,7 @@ import Codec.Binary.UTF8.String as UTF8
 #define UTF8
 #endif
 import Foreign.C (CChar, CLong)
-import Xmobar.Utils (nextEvent')
+import Xmobar.X11.Events (nextEvent')
 
 import Data.List (intersperse, intercalate)
 
diff --git a/src/Xmobar/Plugins/Kbd.hs b/src/Xmobar/Plugins/Kbd.hs
index f4dad36..6654163 100644
--- a/src/Xmobar/Plugins/Kbd.hs
+++ b/src/Xmobar/Plugins/Kbd.hs
@@ -21,7 +21,7 @@ import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
 import Xmobar.Run.Commands
-import Xmobar.Utils (nextEvent')
+import Xmobar.X11.Events (nextEvent')
 import Xmobar.System.Kbd
 
 
diff --git a/src/Xmobar/Plugins/Locks.hs b/src/Xmobar/Plugins/Locks.hs
index 19bce20..25d2946 100644
--- a/src/Xmobar/Plugins/Locks.hs
+++ b/src/Xmobar/Plugins/Locks.hs
@@ -21,7 +21,7 @@ import Control.Monad
 import Graphics.X11.Xlib.Extras
 import Xmobar.Run.Commands
 import Xmobar.System.Kbd
-import Xmobar.Utils (nextEvent')
+import Xmobar.X11.Events (nextEvent')
 
 data Locks = Locks
     deriving (Read, Show)
diff --git a/src/Xmobar/Plugins/MBox.hs b/src/Xmobar/Plugins/MBox.hs
index 4bd0ebd..7eaa998 100644
--- a/src/Xmobar/Plugins/MBox.hs
+++ b/src/Xmobar/Plugins/MBox.hs
@@ -18,7 +18,8 @@ module Xmobar.Plugins.MBox (MBox(..)) where
 import Prelude
 import Xmobar.Run.Commands
 #ifdef INOTIFY
-import Xmobar.Utils (changeLoop, expandHome)
+
+import Xmobar.System.Utils (changeLoop, expandHome)
 
 import Control.Monad (when)
 import Control.Concurrent.STM
diff --git a/src/Xmobar/Plugins/Mail.hs b/src/Xmobar/Plugins/Mail.hs
index d59e70d..e67817b 100644
--- a/src/Xmobar/Plugins/Mail.hs
+++ b/src/Xmobar/Plugins/Mail.hs
@@ -17,7 +17,8 @@ module Xmobar.Plugins.Mail(Mail(..)) where
 
 import Xmobar.Run.Commands
 #ifdef INOTIFY
-import Xmobar.Utils (expandHome, changeLoop)
+
+import Xmobar.System.Utils (expandHome, changeLoop)
 
 import Control.Monad
 import Control.Concurrent.STM
diff --git a/src/Xmobar/Plugins/MarqueePipeReader.hs b/src/Xmobar/Plugins/MarqueePipeReader.hs
index a48e81c..a139aba 100644
--- a/src/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/Xmobar/Plugins/MarqueePipeReader.hs
@@ -16,8 +16,8 @@ module Xmobar.Plugins.MarqueePipeReader where
 
 import System.IO (openFile, IOMode(ReadWriteMode), Handle)
 import Xmobar.System.Environment
-import Xmobar.Utils(tenthSeconds, hGetLineSafe)
-import Xmobar.Run.Commands(Exec(alias, start))
+import Xmobar.Run.Commands(Exec(alias, start), tenthSeconds)
+import Xmobar.System.Utils(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/Xmobar/Plugins/Monitors/Common.hs b/src/Xmobar/Plugins/Monitors/Common.hs
index f683874..383a0f1 100644
--- a/src/Xmobar/Plugins/Monitors/Common.hs
+++ b/src/Xmobar/Plugins/Monitors/Common.hs
@@ -76,7 +76,7 @@ import Text.ParserCombinators.Parsec
 import System.Console.GetOpt
 import Control.Exception (SomeException,handle)
 
-import Xmobar.Utils
+import Xmobar.Run.Commands
 
 -- $monitor
 
diff --git a/src/Xmobar/Plugins/PipeReader.hs b/src/Xmobar/Plugins/PipeReader.hs
index f18b9cb..d7b6a56 100644
--- a/src/Xmobar/Plugins/PipeReader.hs
+++ b/src/Xmobar/Plugins/PipeReader.hs
@@ -15,8 +15,8 @@
 module Xmobar.Plugins.PipeReader(PipeReader(..)) where
 
 import System.IO
-import Xmobar.Utils(hGetLineSafe)
 import Xmobar.Run.Commands(Exec(..))
+import Xmobar.System.Utils(hGetLineSafe)
 import Xmobar.System.Environment(expandEnv)
 import System.Posix.Files
 import Control.Concurrent(threadDelay)
diff --git a/src/Xmobar/Plugins/StdinReader.hs b/src/Xmobar/Plugins/StdinReader.hs
index 1d56ca8..7f5f2ae 100644
--- a/src/Xmobar/Plugins/StdinReader.hs
+++ b/src/Xmobar/Plugins/StdinReader.hs
@@ -23,9 +23,9 @@ import System.Posix.Process
 import System.Exit
 import System.IO
 import Control.Exception (SomeException(..), handle)
-import Xmobar.X11.Actions (stripActions)
-import Xmobar.Utils (hGetLineSafe)
 import Xmobar.Run.Commands
+import Xmobar.X11.Actions (stripActions)
+import Xmobar.System.Utils (hGetLineSafe)
 
 data StdinReader = StdinReader | UnsafeStdinReader
   deriving (Read, Show)
diff --git a/src/Xmobar/Plugins/XMonadLog.hs b/src/Xmobar/Plugins/XMonadLog.hs
index 26b6162..8261980 100644
--- a/src/Xmobar/Plugins/XMonadLog.hs
+++ b/src/Xmobar/Plugins/XMonadLog.hs
@@ -27,7 +27,7 @@ import Codec.Binary.UTF8.String as UTF8
 #define UTF8
 #endif
 import Foreign.C (CChar)
-import Xmobar.Utils (nextEvent')
+import Xmobar.X11.Events (nextEvent')
 import Xmobar.X11.Actions (stripActions)
 
 data XMonadLog = XMonadLog
-- 
cgit v1.2.3