From 45f5d80798806a21a693913291ea8c79c07c1e1b Mon Sep 17 00:00:00 2001 From: Guy Gastineau Date: Fri, 22 Oct 2021 11:32:54 -0400 Subject: Handle signal in perms with the other fields. --- src/Xmobar/Config/Parse.hs | 9 +++++---- 1 file 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" -- cgit v1.2.3