From dc5b6328b50fb4dc1a7487efd69a42db31e1082b Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Wed, 20 Oct 2021 14:49:34 -0700
Subject: Fail when reading a SignalChan, parse signal from defaultConfig.

* Address code review comments on ipc-improvements.
---
 src/Xmobar/App/Main.hs     | 2 +-
 src/Xmobar/Config/Parse.hs | 3 ++-
 src/Xmobar/Config/Types.hs | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

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>)"
-- 
cgit v1.2.3