X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=FPPrac.hs;h=2a67b6e7d9a9f1904a2b0ff2e93d1357b57c3b5f;hb=eda52aa9eeffdf431637caafca573e3f1ef8d50d;hp=7e5a6914225519e0d3056b50344467794f405091;hpb=34b8f3ca223d5404d5f298e5fe9eb41c4002f0cb;p=matthijs%2Fprojects%2Ffpprac.git

diff --git a/FPPrac.hs b/FPPrac.hs
index 7e5a691..2a67b6e 100644
--- a/FPPrac.hs
+++ b/FPPrac.hs
@@ -162,22 +162,32 @@ 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
-	
 
--- | Copy the given surface to the exposed window on an expose event.
+-- | 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.
 onExpose :: IORef Cairo.Surface -> EventM.EventM EventM.EExpose Bool
 onExpose buffer = do
 	current_buffer <- liftIO $ readIORef buffer