summaryrefslogtreecommitdiffhomepage
path: root/src/Parsers.hs
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-07-10 16:21:26 +0100
committerjao <jao@gnu.org>2018-07-10 16:23:11 +0100
commita2365debfaba478042184f5831675d1b08172cc7 (patch)
treeabb4b37777ab965303b0a4a974d5dea9956af9d8 /src/Parsers.hs
parent741b803b943430a262ec36658b13830733e17b48 (diff)
downloadxmobar-a2365debfaba478042184f5831675d1b08172cc7.tar.gz
xmobar-a2365debfaba478042184f5831675d1b08172cc7.tar.bz2
New configuration parameter `textOffsets` (fixes #311)
Diffstat (limited to 'src/Parsers.hs')
-rw-r--r--src/Parsers.hs17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/Parsers.hs b/src/Parsers.hs
index bab13cb..bb5c2ea 100644
--- a/src/Parsers.hs
+++ b/src/Parsers.hs
@@ -28,6 +28,7 @@ import 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)
@@ -214,7 +215,8 @@ parseConfig = runParser parseConf fields "Config" . stripComments
perms = permute $ Config
<$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName
<|?> pBgColor <|?> pFgColor
- <|?> pPosition <|?> pTextOffset <|?> pIconOffset <|?> pBorder
+ <|?> pPosition <|?> pTextOffset <|?> pTextOffsets
+ <|?> pIconOffset <|?> pBorder
<|?> pBdColor <|?> pBdWidth <|?> pAlpha <|?> pHideOnStart
<|?> pAllDesktops <|?> pOverrideRedirect <|?> pPickBroadest
<|?> pLowerOnStart <|?> pPersistent <|?> pIconRoot
@@ -224,7 +226,7 @@ parseConfig = runParser parseConf fields "Config" . stripComments
fields = [ "font", "additionalFonts","bgColor", "fgColor"
, "wmClass", "wmName", "sepChar"
, "alignSep" , "border", "borderColor" ,"template"
- , "position" , "textOffset", "iconOffset"
+ , "position" , "textOffset", "textOffsets", "iconOffset"
, "allDesktops", "overrideRedirect", "pickBroadest"
, "hideOnStart", "lowerOnStart", "persistent", "iconRoot"
, "alpha", "commands"
@@ -242,6 +244,7 @@ parseConfig = runParser parseConf fields "Config" . stripComments
pTemplate = strField template "template"
pTextOffset = readField textOffset "textOffset"
+ pTextOffsets = readIntList textOffsets "textOffsets"
pIconOffset = readField iconOffset "iconOffset"
pPosition = readField position "position"
pHideOnStart = readField hideOnStart "hideOnStart"
@@ -300,6 +303,16 @@ parseConfig = runParser parseConf fields "Config" . stripComments
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