clean Main.hs slightly

This commit is contained in:
Don Stewart
2007-05-27 07:21:06 +00:00
parent 325329e5d7
commit fdc6af5faa

13
Main.hs
View File

@@ -80,6 +80,7 @@ main = do
mapM_ manage ws mapM_ manage ws
-- main loop, for all you HOF/recursion fans out there. -- main loop, for all you HOF/recursion fans out there.
forever $ handle =<< io (nextEvent dpy e >> getEvent e) forever $ handle =<< io (nextEvent dpy e >> getEvent e)
where forever a = a >> forever a where forever a = a >> forever a
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
@@ -91,10 +92,10 @@ scan :: Display -> Window -> IO [Window]
scan dpy rootw = do scan dpy rootw = do
(_, _, ws) <- queryTree dpy rootw (_, _, ws) <- queryTree dpy rootw
filterM ok ws filterM ok ws
where
ok w = do wa <- getWindowAttributes dpy w where ok w = do wa <- getWindowAttributes dpy w
return $ not (wa_override_redirect wa) return $ not (wa_override_redirect wa)
&& wa_map_state wa == waIsViewable && wa_map_state wa == waIsViewable
-- | Grab the keys back -- | Grab the keys back
grabKeys :: Display -> Window -> IO () grabKeys :: Display -> Window -> IO ()
@@ -106,8 +107,8 @@ grabKeys dpy rootw = do
-- XKeysymToKeycode() returns zero." -- XKeysymToKeycode() returns zero."
when (kc /= '\0') $ mapM_ (grab kc . (mask .|.)) $ when (kc /= '\0') $ mapM_ (grab kc . (mask .|.)) $
[0, numlockMask, lockMask, numlockMask .|. lockMask] [0, numlockMask, lockMask, numlockMask .|. lockMask]
where
grab kc m = grabKey dpy kc m rootw True grabModeAsync grabModeAsync where grab kc m = grabKey dpy kc m rootw True grabModeAsync grabModeAsync
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- | Event handler. Map X events onto calls into Operations.hs, which -- | Event handler. Map X events onto calls into Operations.hs, which