diff options
| author | Guy Gastineau <strings.stringsandstrings@gmail.com> | 2021-10-22 11:32:54 -0400 |
|---|---|---|
| committer | John Soo <jsoo1@asu.edu> | 2021-11-07 17:47:47 -0800 |
| commit | 45f5d80798806a21a693913291ea8c79c07c1e1b (patch) | |
| tree | 02d443e0e277d6e019bd32360b5e1c39a198e86a | |
| parent | dc5b6328b50fb4dc1a7487efd69a42db31e1082b (diff) | |
| download | xmobar-45f5d80798806a21a693913291ea8c79c07c1e1b.tar.gz xmobar-45f5d80798806a21a693913291ea8c79c07c1e1b.tar.bz2 | |
Handle signal in perms with the other fields.
| -rw-r--r-- | src/Xmobar/Config/Parse.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Xmobar/Config/Parse.hs b/src/Xmobar/Config/Parse.hs index d9afdf2..123d00d 100644 --- a/src/Xmobar/Config/Parse.hs +++ b/src/Xmobar/Config/Parse.hs @@ -57,8 +57,7 @@ parseConfig defaultConfig = x <- perms eof s <- getState - let sig = signal defaultConfig - return (x sig ,s) + return (x, s) perms = permute $ Config <$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName @@ -69,7 +68,7 @@ parseConfig defaultConfig = <|?> pAllDesktops <|?> pOverrideRedirect <|?> pPickBroadest <|?> pLowerOnStart <|?> pPersistent <|?> pIconRoot <|?> pCommands <|?> pSepChar <|?> pAlignSep <|?> pTemplate - <|?> pVerbose + <|?> pVerbose <|?> pSignal fields = [ "font", "additionalFonts","bgColor", "fgColor" , "wmClass", "wmName", "sepChar" @@ -77,7 +76,7 @@ parseConfig defaultConfig = , "position" , "textOffset", "textOffsets", "iconOffset" , "allDesktops", "overrideRedirect", "pickBroadest" , "hideOnStart", "lowerOnStart", "persistent", "iconRoot" - , "alpha", "commands", "verbose" + , "alpha", "commands", "verbose", "signal" ] pFont = strField font "font" @@ -107,6 +106,8 @@ parseConfig defaultConfig = pAlpha = readField alpha "alpha" pVerbose = readField verbose "verbose" + pSignal = field signal "signal" $ fail "use default signal" + pCommands = field commands "commands" readCommands staticPos = do string "Static" |