X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Ffpprac.git;a=blobdiff_plain;f=FPPrac.hs;h=306f048001dca25e62b2864c98e2b01fda06af78;hp=9f5ec9d68eb5f5d4c7d523ed9745b51b7bbae8db;hb=HEAD;hpb=71612a0748db45e78a07aa5f92da543688573745

diff --git a/FPPrac.hs b/FPPrac.hs
index 9f5ec9d..306f048 100644
--- a/FPPrac.hs
+++ b/FPPrac.hs
@@ -93,7 +93,7 @@ data TinaProgram = forall s. Main
 testProg = Main
 	{ initialState    = 1
 	, initialRequests = [GfxText red (pt 0 0) "foo", GfxText blue (pt 100 100) "bar"]
-	, eventHandler    = \s e -> (s+1,[GfxText green (pt 50 50) $ show (s,e)])
+	, eventHandler    = \s e -> (s+1,[GfxText green (pt 50 (50 + 10 * s)) $ show (s,e)])
 	, windowWidth     = 200
 	, windowHeight    = 200
 	}
@@ -162,20 +162,29 @@ runGUI w h (IS { .. }) = do
 	buffer' <- Cairo.createImageSurface Cairo.FormatARGB32 w h
 	buffer <- newIORef buffer'
 
+	-- Repack state
+	let state = IS { .. }
+	
 	-- Register events
 	Gtk.on window Gtk.exposeEvent $ onExpose buffer
 	Gtk.on window Gtk.configureEvent $ onResize buffer
+	Gtk.on window Gtk.keyPressEvent $ onKeyDown state
 
-	-- Repack state
-	let state = IS { .. }
-	
 	-- Process any initial requests
 	processPostponed state
 
 	-- Show the window and start the Gtk mainloop.
 	Gtk.widgetShowAll window
 	Gtk.mainGUI
-	
+
+-- | Called when a key is pressed.
+onKeyDown :: IState -> EventM.EventM EventM.EKey Bool
+onKeyDown s = do
+	keyval <- EventM.eventKeyVal
+	case Gtk.keyToChar keyval of
+		Just c -> liftIO $ post s (KeyIn c)
+		Nothing -> return ()
+	return True -- No clue what this means
 
 -- | Called when (part of) the window should be redrawn. Copy the given surface
 --   to the exposed window on an expose event.