summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar/Parsers.hs
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-11-21 23:47:36 +0000
committerjao <jao@gnu.org>2018-11-21 23:47:36 +0000
commit7674145b878fd315999558075edcfc5e09bdd91c (patch)
treed271157e3ac79478bed8e27170d49de6f1c4e2e2 /src/Xmobar/Parsers.hs
parent0c5f9ddc26e2f581a79f0a32c29f97a0a9ed35b5 (diff)
downloadxmobar-7674145b878fd315999558075edcfc5e09bdd91c.tar.gz
xmobar-7674145b878fd315999558075edcfc5e09bdd91c.tar.bz2
Configuration file parsing moved to app module
Diffstat (limited to 'src/Xmobar/Parsers.hs')
-rw-r--r--src/Xmobar/Parsers.hs136
1 files changed, 1 insertions, 135 deletions
diff --git a/src/Xmobar/Parsers.hs b/src/Xmobar/Parsers.hs
index d76f8f7..33afd09 100644
--- a/src/Xmobar/Parsers.hs
+++ b/src/Xmobar/Parsers.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE FlexibleContexts #-}
+
-----------------------------------------------------------------------------
-- |
-- Module : Xmobar.Parsers
@@ -16,7 +17,6 @@
module Xmobar.Parsers
( parseString
, parseTemplate
- , parseConfig
, Widget(..)
) where
@@ -28,8 +28,6 @@ import Xmobar.Actions
import Control.Monad (guard, mzero)
import qualified Data.Map as Map
import Text.ParserCombinators.Parsec
-import Text.ParserCombinators.Parsec.Number (int)
-import Text.ParserCombinators.Parsec.Perm
import Graphics.X11.Types (Button)
data Widget = Icon String | Text String
@@ -190,135 +188,3 @@ combine c m ((ts,s,ss):xs) = (com, s, ss) : combine c m xs
allTillSep :: Config -> Parser String
allTillSep = many . noneOf . sepChar
-
-stripComments :: String -> String
-stripComments =
- unlines . map (drop 5 . strip False . (replicate 5 ' '++)) . lines
- where strip m ('-':'-':xs) = if m then "--" ++ strip m xs else ""
- strip m ('"':xs) = '"': strip (not m) xs
- strip m (x:xs) = x : strip m xs
- strip _ [] = []
-
--- | Parse the config, logging a list of fields that were missing and replaced
--- by the default definition.
-parseConfig :: String -> Either ParseError (Config,[String])
-parseConfig = runParser parseConf fields "Config" . stripComments
- where
- parseConf = do
- many space
- sepEndSpc ["Config","{"]
- x <- perms
- eof
- s <- getState
- return (x,s)
-
- perms = permute $ Config
- <$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName
- <|?> pBgColor <|?> pFgColor
- <|?> pPosition <|?> pTextOffset <|?> pTextOffsets
- <|?> pIconOffset <|?> pBorder
- <|?> pBdColor <|?> pBdWidth <|?> pAlpha <|?> pHideOnStart
- <|?> pAllDesktops <|?> pOverrideRedirect <|?> pPickBroadest
- <|?> pLowerOnStart <|?> pPersistent <|?> pIconRoot
- <|?> pCommands <|?> pSepChar <|?> pAlignSep <|?> pTemplate
-
-
- fields = [ "font", "additionalFonts","bgColor", "fgColor"
- , "wmClass", "wmName", "sepChar"
- , "alignSep" , "border", "borderColor" ,"template"
- , "position" , "textOffset", "textOffsets", "iconOffset"
- , "allDesktops", "overrideRedirect", "pickBroadest"
- , "hideOnStart", "lowerOnStart", "persistent", "iconRoot"
- , "alpha", "commands"
- ]
-
- pFont = strField font "font"
- pFontList = strListField additionalFonts "additionalFonts"
- pWmClass = strField wmClass "wmClass"
- pWmName = strField wmName "wmName"
- pBgColor = strField bgColor "bgColor"
- pFgColor = strField fgColor "fgColor"
- pBdColor = strField borderColor "borderColor"
- pSepChar = strField sepChar "sepChar"
- pAlignSep = strField alignSep "alignSep"
- pTemplate = strField template "template"
-
- pTextOffset = readField textOffset "textOffset"
- pTextOffsets = readIntList textOffsets "textOffsets"
- pIconOffset = readField iconOffset "iconOffset"
- pPosition = readField position "position"
- pHideOnStart = readField hideOnStart "hideOnStart"
- pLowerOnStart = readField lowerOnStart "lowerOnStart"
- pPersistent = readField persistent "persistent"
- pBorder = readField border "border"
- pBdWidth = readField borderWidth "borderWidth"
- pAllDesktops = readField allDesktops "allDesktops"
- pOverrideRedirect = readField overrideRedirect "overrideRedirect"
- pPickBroadest = readField pickBroadest "pickBroadest"
- pIconRoot = readField iconRoot "iconRoot"
- pAlpha = readField alpha "alpha"
-
- pCommands = field commands "commands" readCommands
-
- staticPos = do string "Static"
- wrapSkip (string "{")
- p <- many (noneOf "}")
- wrapSkip (string "}")
- string ","
- return ("Static {" ++ p ++ "}")
- tillFieldEnd = staticPos <|> many (noneOf ",}\n\r")
-
- commandsEnd = wrapSkip (string "]") >> (string "}" <|> notNextRun)
- notNextRun = do {string ","
- ; notFollowedBy $ wrapSkip $ string "Run"
- ; return ","
- }
- readCommands = manyTill anyChar (try commandsEnd) >>=
- read' commandsErr . flip (++) "]"
- strField e n = field e n strMulti
-
- strMulti = scan '"'
- where
- scan lead = do
- spaces
- char lead
- s <- manyTill anyChar (rowCont <|> unescQuote)
- (char '"' >> return s) <|> fmap (s ++) (scan '\\')
- rowCont = try $ char '\\' >> string "\n"
- unescQuote = lookAhead (noneOf "\\") >> lookAhead (string "\"")
-
- strListField e n = field e n strList
- strList = do
- spaces
- char '['
- list <- sepBy (strMulti >>= \x -> spaces >> return x) (char ',')
- spaces
- char ']'
- return list
-
- wrapSkip x = many space >> x >>= \r -> many space >> return r
- sepEndSpc = mapM_ (wrapSkip . try . string)
- fieldEnd = many $ space <|> oneOf ",}"
- field e n c = (,) (e defaultConfig) $
- updateState (filter (/= n)) >> sepEndSpc [n,"="] >>
- wrapSkip c >>= \r -> fieldEnd >> return r
- readField a n = field a n $ tillFieldEnd >>= read' n
-
- readIntList d n = field d n intList
- intList = do
- spaces
- char '['
- list <- sepBy (spaces >> int >>= \x-> spaces >> return x) (char ',')
- spaces
- char ']'
- return list
-
- read' d s = case reads s of
- [(x, _)] -> return x
- _ -> fail $ "error reading the " ++ d ++ " field: " ++ s
-
-commandsErr :: String
-commandsErr = "commands: this usually means that a command could not" ++
- "\nbe parsed." ++
- "\nThe error could be located at the begining of the command" ++
- "\nwhich follows the offending one."