diff options
author | Don Stewart <dons@cse.unsw.edu.au> | 2007-03-07 04:38:55 +0100 |
---|---|---|
committer | Don Stewart <dons@cse.unsw.edu.au> | 2007-03-07 04:38:55 +0100 |
commit | a7d2446ed524d61515543f1fa32c5218431e9ee4 (patch) | |
tree | 11a2250c03d4bc68665109f0670c00e3666b58e2 /Main.hs | |
parent | 698697cfa3185b0d7e1be28101b67a6850587eb7 (diff) | |
download | metatile-a7d2446ed524d61515543f1fa32c5218431e9ee4.tar metatile-a7d2446ed524d61515543f1fa32c5218431e9ee4.zip |
refactoring
darcs-hash:20070307033855-9c5c1-999ba9e7d3cd15a6363e8da777879ed72d0020c6
Diffstat (limited to 'Main.hs')
-rw-r--r-- | Main.hs | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -15,16 +15,21 @@ import qualified Data.Map as Map import Data.Map (Map) + import Data.Sequence as Seq import qualified Data.Foldable as Fold + import Data.Bits -import Control.Monad.State + import System.IO -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import System.Process (runCommand) import System.Exit +import Graphics.X11.Xlib +import Graphics.X11.Xlib.Extras + +import Control.Monad.State + import W ------------------------------------------------------------------------ @@ -65,8 +70,6 @@ loop = do forever $ do e <- io $ allocaXEvent $ \ev -> nextEvent dpy ev >> getEvent ev handler e - where - forever a = a >> forever a -- -- The event handler @@ -78,13 +81,14 @@ handler (DestroyWindowEvent {window = w}) = do modifyWindows (Seq.fromList . filter (/= w) . Fold.toList) refresh -handler (KeyEvent {event_type = t, state = mod, keycode = code}) - | t == keyPress = do - dpy <- getDisplay - sym <- io $ keycodeToKeysym dpy code 0 - case filter (\(mod', sym', _) -> mod == mod' && sym == sym') keys of - [] -> return () - ((_, _, act):_) -> act +handler (KeyEvent {event_type = t, state = mod, keycode = code}) + | t == keyPress = do + dpy <- getDisplay + sym <- io $ keycodeToKeysym dpy code 0 + case filter (\(mod', sym', _) -> mod == mod' && sym == sym') keys of + [] -> return () + ((_, _, act):_) -> act + handler _ = return () -- |