summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar
diff options
context:
space:
mode:
authorJohn Soo <jsoo1@asu.edu>2021-10-20 14:49:34 -0700
committerJohn Soo <jsoo1@asu.edu>2021-11-07 17:47:47 -0800
commitdc5b6328b50fb4dc1a7487efd69a42db31e1082b (patch)
tree228032dedf427e657e5f3adbc972a45e1a342fc1 /src/Xmobar
parentebea33e52fb71b049baf17374b88a7521de4097f (diff)
downloadxmobar-dc5b6328b50fb4dc1a7487efd69a42db31e1082b.tar.gz
xmobar-dc5b6328b50fb4dc1a7487efd69a42db31e1082b.tar.bz2
Fail when reading a SignalChan, parse signal from defaultConfig.
* Address code review comments on ipc-improvements.
Diffstat (limited to 'src/Xmobar')
-rw-r--r--src/Xmobar/App/Main.hs2
-rw-r--r--src/Xmobar/Config/Parse.hs3
-rw-r--r--src/Xmobar/Config/Types.hs2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Xmobar/App/Main.hs b/src/Xmobar/App/Main.hs
index 002ff27..d969cc5 100644
--- a/src/Xmobar/App/Main.hs
+++ b/src/Xmobar/App/Main.hs
@@ -18,7 +18,7 @@
module Xmobar.App.Main (xmobar, xmobarMain, configFromArgs) where
import Control.Concurrent.Async (Async, cancel)
-import Control.Concurrent.STM (TMVar, newEmptyTMVarIO)
+import Control.Concurrent.STM (newEmptyTMVarIO)
import Control.Exception (bracket)
import Control.Monad (unless)
diff --git a/src/Xmobar/Config/Parse.hs b/src/Xmobar/Config/Parse.hs
index 48a31c3..d9afdf2 100644
--- a/src/Xmobar/Config/Parse.hs
+++ b/src/Xmobar/Config/Parse.hs
@@ -57,7 +57,8 @@ parseConfig defaultConfig =
x <- perms
eof
s <- getState
- return (x (SignalChan Nothing),s)
+ let sig = signal defaultConfig
+ return (x sig ,s)
perms = permute $ Config
<$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName
diff --git a/src/Xmobar/Config/Types.hs b/src/Xmobar/Config/Types.hs
index 3cad31c..dd5aeb8 100644
--- a/src/Xmobar/Config/Types.hs
+++ b/src/Xmobar/Config/Types.hs
@@ -99,7 +99,7 @@ data Border = NoBorder
newtype SignalChan = SignalChan { unSignalChan :: Maybe (STM.TMVar SignalType) }
instance Read SignalChan where
- readsPrec _ s = [ (SignalChan Nothing, s) ]
+ readsPrec _ _ = fail "Trying to read a SignalChan"
instance Show SignalChan where
show (SignalChan (Just _)) = "SignalChan (Just <tmvar>)"