TextOutputColor -> TextOutputFormat

Thinking of eventually adding a Sway JSON output, or simply add fonts
to Pango specification, so it's more than colors.
Also, NoColors -> Plain.

5 files changed, 14 insertions, 14 deletions

diff --git a/src/Xmobar/App/Config.hs b/src/Xmobar/App/Config.hs
index 7d3c781..a284973 100644
--- a/src/Xmobar/App/Config.hs
+++ b/src/Xmobar/App/Config.hs
@@ -66,7 +66,7 @@ defaultConfig =
            , verbose = False
            , signal = SignalChan Nothing
            , textOutput = False
-           , textOutputColors = NoColors
+           , textOutputFormat = Plain
            }
 
 -- | Return the path to the xmobar data directory.  This directory is
diff --git a/src/Xmobar/App/Opts.hs b/src/Xmobar/App/Opts.hs
index 2925d26..9f19ff6 100644
--- a/src/Xmobar/App/Opts.hs
+++ b/src/Xmobar/App/Opts.hs
@@ -61,7 +61,7 @@ options =
     , Option "r" ["recompile"] (NoArg Recompile) "Force recompilation"
     , Option "V" ["version"] (NoArg Version) "Show version information"
     , Option "T" ["text"] (OptArg TextOutput "color")
-             "Write text-only output to stdout. NoColors/Ansi/Pango"
+             "Write text-only output to stdout. Plain/Ansi/Pango"
     , Option "f" ["font"] (ReqArg Font "font name") "Font name"
     , Option "N" ["add-font"] (ReqArg AddFont "font name")
              "Add to the list of additional fonts"
@@ -136,7 +136,7 @@ doOpts conf (o:oo) =
     Recompile -> doOpts' conf
     TextOutput s -> doOpts' $ case s of
                                 Just fmt -> conf {textOutput = True,
-                                                  textOutputColors = read fmt}
+                                                  textOutputFormat = read fmt}
                                 Nothing -> conf {textOutput = True}
     Verbose -> doOpts' (conf {verbose = True})
     Font s -> doOpts' (conf {font = s})
diff --git a/src/Xmobar/App/TextEventLoop.hs b/src/Xmobar/App/TextEventLoop.hs
index 3b754ac..e516298 100644
--- a/src/Xmobar/App/TextEventLoop.hs
+++ b/src/Xmobar/App/TextEventLoop.hs
@@ -27,7 +27,7 @@ import Control.Concurrent.Async (Async)
 import Control.Concurrent.STM
 
 import Xmobar.System.Signal
-import Xmobar.Config.Types (Config(textOutputColors), TextColorFormat(..))
+import Xmobar.Config.Types (Config(textOutputFormat), TextOutputFormat(..))
 import Xmobar.X11.Parsers (Segment, Widget(..), parseString, tColorsString, colorComponents)
 import Xmobar.App.CommandThreads (initLoop, loop)
 
@@ -100,16 +100,16 @@ withPangoColor (fg, bg) s =
   printf fmt (xmlEscape fg) (xmlEscape bg) (xmlEscape s)
   where fmt = "<span foreground=\"%s\" background=\"%s\">%s</span>"
 
-withColor :: TextColorFormat -> (String, String) -> String -> String
+withColor :: TextOutputFormat -> (String, String) -> String -> String
 withColor format color = case format of
-                           NoColors -> id
+                           Plain -> id
                            Ansi -> withAnsiColor color
                            Pango -> withPangoColor color
-                                
+
 
 asText :: Config -> Segment -> String
 asText conf (Text s, info, _, _) =
-  withColor (textOutputColors conf) components s
+  withColor (textOutputFormat conf) components s
   where components = colorComponents conf color
         color = tColorsString info
 asText colors (Hspace n, i, x, y) =
diff --git a/src/Xmobar/Config/Parse.hs b/src/Xmobar/Config/Parse.hs
index fa99c59..89af808 100644
--- a/src/Xmobar/Config/Parse.hs
+++ b/src/Xmobar/Config/Parse.hs
@@ -62,7 +62,7 @@ parseConfig defaultConfig =
       perms = permute $ Config
               <$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName
               <|?> pBgColor <|?> pFgColor <|?> pPosition
-              <|?> pTextOutput <|?> pTextOutputColors
+              <|?> pTextOutput <|?> pTextOutputFormat
               <|?> pTextOffset <|?> pTextOffsets
               <|?> pIconOffset <|?> pBorder
               <|?> pBdColor <|?> pBdWidth <|?> pAlpha <|?> pHideOnStart
@@ -78,11 +78,11 @@ parseConfig defaultConfig =
                   , "allDesktops", "overrideRedirect", "pickBroadest"
                   , "hideOnStart", "lowerOnStart", "persistent", "iconRoot"
                   , "alpha", "commands", "verbose", "signal", "textOutput"
-                  , "textOutputColors"
+                  , "textOutputFormat"
                   ]
 
       pTextOutput = readField textOutput "textOutput"
-      pTextOutputColors = readField textOutputColors "textOutputColors"
+      pTextOutputFormat = readField textOutputFormat "textOutputFormat"
       pFont = strField font "font"
       pFontList = strListField additionalFonts "additionalFonts"
       pWmClass = strField wmClass "wmClass"
diff --git a/src/Xmobar/Config/Types.hs b/src/Xmobar/Config/Types.hs
index 5f19528..7914a87 100644
--- a/src/Xmobar/Config/Types.hs
+++ b/src/Xmobar/Config/Types.hs
@@ -16,7 +16,7 @@ module Xmobar.Config.Types
     ( -- * Configuration
       -- $config
       Config (..)
-    , XPosition (..), Align (..), Border (..), TextColorFormat (..)
+    , XPosition (..), Align (..), Border (..), TextOutputFormat (..)
     , SignalChan (..)
     ) where
 
@@ -37,7 +37,7 @@ data Config =
            , fgColor :: String      -- ^ Default font color
            , position :: XPosition  -- ^ Top Bottom or Static
            , textOutput :: Bool     -- ^ Write data to stdout instead of X
-           , textOutputColors :: TextColorFormat -- ^ Which color format to use for stdout: Ansi or Pango
+           , textOutputFormat :: TextOutputFormat -- ^ Which color format to use for stdout: Ansi or Pango
            , textOffset :: Int      -- ^ Offset from top of window for text
            , textOffsets :: [Int]   -- ^ List of offsets for additionalFonts
            , iconOffset :: Int      -- ^ Offset from top of window for icons
@@ -98,7 +98,7 @@ data Border = NoBorder
             | FullBM Int
               deriving ( Read, Show, Eq )
 
-data TextColorFormat = NoColors | Ansi | Pango deriving ( Read, Show, Eq )
+data TextOutputFormat = Plain | Ansi | Pango deriving ( Read, Show, Eq )
 
 newtype SignalChan = SignalChan { unSignalChan :: Maybe (STM.TMVar SignalType) }