diff options
| author | jao <jao@gnu.org> | 2014-12-29 23:56:42 +0100 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2014-12-30 00:26:36 +0100 |
| commit | 22d41c0e611a7c2cc51209a4cc750ee87921e54a (patch) | |
| tree | b43d12c74f91a6cdef3878010da9d8935abf1368 /src/Parsers.hs | |
| parent | 87e92c4023a4a6cac5b6ff2e95b6d346eef10bd3 (diff) | |
| parent | a98ac8fba46b8858959cee6062a49c9121f07fe9 (diff) | |
| download | xmobar-22d41c0e611a7c2cc51209a4cc750ee87921e54a.tar.gz xmobar-22d41c0e611a7c2cc51209a4cc750ee87921e54a.tar.bz2 | |
Merge branch 'transparency' of https://github.com/ezyang/xmobar
Conflicts:
src/Config.hs
src/Main.hs
src/Parsers.hs
src/XUtil.hsc
src/Xmobar.hs
Diffstat (limited to 'src/Parsers.hs')
| -rw-r--r-- | src/Parsers.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Parsers.hs b/src/Parsers.hs index cdc180d..d2fa1bf 100644 --- a/src/Parsers.hs +++ b/src/Parsers.hs @@ -199,8 +199,8 @@ parseConfig = runParser parseConf fields "Config" . stripComments perms = permute $ Config <$?> pFont <|?> pBgColor <|?> pFgColor <|?> pPosition - <|?> pTextOffset <|?> pIconOffset - <|?> pBorder <|?> pBdColor <|?> pBdWidth <|?> pHideOnStart + <|?> pTextOffset <|?> pIconOffset <|?> pBorder + <|?> pBdColor <|?> pBdWidth <|?> pAlpha <|?> pHideOnStart <|?> pAllDesktops <|?> pOverrideRedirect <|?> pPickBroadest <|?> pLowerOnStart <|?> pPersistent <|?> pIconRoot <|?> pCommands <|?> pSepChar <|?> pAlignSep <|?> pTemplate @@ -211,7 +211,7 @@ parseConfig = runParser parseConf fields "Config" . stripComments , "textOffset", "iconOffset" , "allDesktops", "overrideRedirect", "pickBroadest" , "hideOnStart", "lowerOnStart", "persistent", "iconRoot" - , "commands" + , "alpha", "commands" ] pFont = strField font "font" @@ -234,6 +234,7 @@ parseConfig = runParser parseConf fields "Config" . stripComments pOverrideRedirect = readField overrideRedirect "overrideRedirect" pPickBroadest = readField pickBroadest "pickBroadest" pIconRoot = readField iconRoot "iconRoot" + pAlpha = readField alpha "alpha" pCommands = field commands "commands" readCommands |