From fa4b999c73067cb55e316b94fe62aebb147cea98 Mon Sep 17 00:00:00 2001
From: Jochen Keil <jochen.keil@gmail.com>
Date: Thu, 9 Aug 2012 10:12:39 +0200
Subject: Create signal handler in main and pass it down to the start*
 functions

This is necessary for setting up the signal callback (trigger) from the
Plugin interface. As another benefit it is now possible to implement the
lowerOnStart config option properly by simply sending a Hide signal in
startLoop.
---
 src/Main.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/Main.hs')

diff --git a/src/Main.hs b/src/Main.hs
index 4c3f351..c7045b5 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -36,6 +36,8 @@ import System.Environment
 import System.Posix.Files
 import Control.Monad (unless)
 
+import Signal (setupSignalHandler, SignalType(..))
+
 -- $main
 
 -- | The main entry point
@@ -55,9 +57,10 @@ main = do
   conf  <- doOpts c o
   fs    <- initFont d (font conf)
   cls   <- mapM (parseTemplate conf) (splitTemplate conf)
-  vars  <- mapM (mapM startCommand) cls
+  sig   <- setupSignalHandler
+  vars  <- mapM (mapM $ startCommand sig) cls
   (r,w) <- createWin d fs conf
-  startLoop (XConf d r w fs conf) vars
+  startLoop (XConf d r w fs conf) sig vars
 
 -- | Splits the template in its parts
 splitTemplate :: Config -> [String]
-- 
cgit v1.2.3