From dbf4ea77dc318f5d3b68651eabc562cd6cefec51 Mon Sep 17 00:00:00 2001
From: Martin Perner <martin@perner.cc>
Date: Wed, 7 Sep 2011 13:09:52 +0200
Subject: complete reword of the eventLoop

*) replaced window destroy and create with a reposition
*) replaced the exception for redraw with an MVar
*) put nextEvent into an own thread, communication over the MVar
*) signal handlers for repositioning and screen swap

Notes:
*) getScreenInfo is a parameter of eventLoop because it blocks when there
is an nextEvent waiting for an new event
---
 src/Main.hs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/Main.hs')

diff --git a/src/Main.hs b/src/Main.hs
index 941a844..34a298d 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -41,8 +41,8 @@ import Control.Monad (unless)
 -- | The main entry point
 main :: IO ()
 main = do
+  initThreads
   d   <- openDisplay ""
-  d'  <- openDisplay ""
   args     <- getArgs
   (o,file) <- getOpts args
   (c,defaultings) <- case file of
@@ -52,17 +52,13 @@ main = do
   unless (null defaultings) $ putStrLn $ "Fields missing from config defaulted: "
                                             ++ intercalate "," defaultings
 
-  -- listen for ConfigureEvents on the root window, for xrandr support:
-  rootw <- rootWindow d (defaultScreen d)
-  selectInput d rootw structureNotifyMask
-
   conf  <- doOpts c o
   fs    <- initFont d (font conf)
   cls   <- mapM (parseTemplate conf) (splitTemplate conf)
   vars  <- mapM (mapM startCommand) cls
-  (r,w) <- createWin d fs conf
-  _ <- enableXRandrEventListen d'
-  eventLoop (XConf d d' r w fs conf) vars
+  (r,w, srs) <- createWin d fs conf
+  sig   <- setupSignalHandler
+  eventLoop (XConf d r w fs conf) vars sig srs
 
 -- | Splits the template in its parts
 splitTemplate :: Config -> [String]
-- 
cgit v1.2.3