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.

1 files changed, 0 insertions, 128 deletions

diff --git a/src/Plugins/Monitors/MultiCpu.hs b/src/Plugins/Monitors/MultiCpu.hs
deleted file mode 100644
index 1477cf6..0000000
--- a/src/Plugins/Monitors/MultiCpu.hs
+++ /dev/null
@@ -1,128 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Plugins.Monitors.MultiCpu
--- Copyright   :  (c) Jose A Ortega Ruiz
--- License     :  BSD-style (see LICENSE)
---
--- Maintainer  :  Jose A Ortega <jao@gnu.org>
--- Stability   :  unstable
--- Portability :  unportable
---
--- A multi-cpu monitor for Xmobar
---
------------------------------------------------------------------------------
-
-module Plugins.Monitors.MultiCpu (startMultiCpu) where
-
-import Plugins.Monitors.Common
-import Control.Applicative ((<$>))
-import qualified Data.ByteString.Lazy.Char8 as B
-import Data.List (isPrefixOf, transpose, unfoldr)
-import Data.IORef (IORef, newIORef, readIORef, writeIORef)
-import System.Console.GetOpt
-
-data MultiCpuOpts = MultiCpuOpts
-  { loadIconPatterns :: [IconPattern]
-  , loadIconPattern :: Maybe IconPattern
-  , fallbackIconPattern :: Maybe IconPattern
-  }
-
-defaultOpts :: MultiCpuOpts
-defaultOpts = MultiCpuOpts
-  { loadIconPatterns = []
-  , loadIconPattern = Nothing
-  , fallbackIconPattern = Nothing
-  }
-
-options :: [OptDescr (MultiCpuOpts -> MultiCpuOpts)]
-options =
-  [ Option "" ["load-icon-pattern"] (ReqArg (\x o ->
-     o { loadIconPattern = Just $ parseIconPattern x }) "") ""
-  , Option "" ["load-icon-patterns"] (ReqArg (\x o ->
-     o { loadIconPatterns = parseIconPattern x : loadIconPatterns o }) "") ""
-  , Option "" ["fallback-icon-pattern"] (ReqArg (\x o ->
-     o { fallbackIconPattern = Just $ parseIconPattern x }) "") ""
-  ]
-
-parseOpts :: [String] -> IO MultiCpuOpts
-parseOpts argv =
-  case getOpt Permute options argv of
-    (o, _, []) -> return $ foldr id defaultOpts o
-    (_, _, errs) -> ioError . userError $ concat errs
-
-variables :: [String]
-variables = ["bar", "vbar","ipat","total","user","nice","system","idle"]
-vNum :: Int
-vNum = length variables
-
-multiCpuConfig :: IO MConfig
-multiCpuConfig =
-  mkMConfig "Cpu: <total>%" $
-            ["auto" ++ k | k <- variables] ++
-            [ k ++ n     | n <- "" : map show [0 :: Int ..]
-                         , k <- variables]
-
-type CpuDataRef = IORef [[Int]]
-
-cpuData :: IO [[Int]]
-cpuData = parse `fmap` B.readFile "/proc/stat"
-  where parse = map parseList . cpuLists
-        cpuLists = takeWhile isCpu . map B.words . B.lines
-        isCpu (w:_) = "cpu" `isPrefixOf` B.unpack w
-        isCpu _ = False
-        parseList = map (parseInt . B.unpack) . tail
-
-parseCpuData :: CpuDataRef -> IO [[Float]]
-parseCpuData cref =
-  do as <- readIORef cref
-     bs <- cpuData
-     writeIORef cref bs
-     let p0 = zipWith percent bs as
-     return p0
-
-percent :: [Int] -> [Int] -> [Float]
-percent b a = if tot > 0 then map (/ tot) $ take 4 dif else [0, 0, 0, 0]
-  where dif = map fromIntegral $ zipWith (-) b a
-        tot = sum dif
-
-formatMultiCpus :: MultiCpuOpts -> [[Float]] -> Monitor [String]
-formatMultiCpus _ [] = return []
-formatMultiCpus opts xs = concat <$> mapM (\(i, x) -> formatCpu opts i x) (zip [0..] xs)
-
-formatCpu :: MultiCpuOpts -> Int -> [Float] -> Monitor [String]
-formatCpu opts i xs
-  | length xs < 4 = showPercentsWithColors $ replicate vNum 0.0
-  | otherwise = let t = sum $ take 3 xs
-                in do b <- showPercentBar (100 * t) t
-                      h <- showVerticalBar (100 * t) t
-                      d <- showIconPattern tryString t
-                      ps <- showPercentsWithColors (t:xs)
-                      return (b:h:d:ps)
-  where tryString
-          | i == 0 = loadIconPattern opts
-          | i <= length (loadIconPatterns opts) = Just $ loadIconPatterns opts !! (i - 1)
-          | otherwise = fallbackIconPattern opts
-
-splitEvery :: Int -> [a] -> [[a]]
-splitEvery n = unfoldr (\x -> if null x then Nothing else Just $ splitAt n x)
-
-groupData :: [String] -> [[String]]
-groupData = transpose . tail . splitEvery vNum
-
-formatAutoCpus :: [String] -> Monitor [String]
-formatAutoCpus [] = return $ replicate vNum ""
-formatAutoCpus xs = return $ map unwords (groupData xs)
-
-runMultiCpu :: CpuDataRef -> [String] -> Monitor String
-runMultiCpu cref argv =
-  do c <- io $ parseCpuData cref
-     opts <- io $ parseOpts argv
-     l <- formatMultiCpus opts c
-     a <- formatAutoCpus l
-     parseTemplate $ a ++ l
-
-startMultiCpu :: [String] -> Int -> (String -> IO ()) -> IO ()
-startMultiCpu a r cb = do
-  cref <- newIORef [[]]
-  _ <- parseCpuData cref
-  runM a multiCpuConfig (runMultiCpu cref) r cb