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

diff --git a/FPPrac.hs b/FPPrac.hs
index 14e8c4f..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,21 +162,32 @@ runGUI w h (IS { .. }) = do
 	buffer' <- Cairo.createImageSurface Cairo.FormatARGB32 w h
 	buffer <- newIORef buffer'
 
-	-- Register the expose event
-	Gtk.on window Gtk.exposeEvent $ onExpose 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
+
 	-- 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
@@ -187,6 +198,32 @@ onExpose buffer = do
 		Cairo.paint
 	return True -- No clue what this means
 
+-- | Called when the window is resized. Resize the given buffer if needed.
+onResize :: IORef Cairo.Surface -> EventM.EventM EventM.EConfigure Bool
+onResize buffer = do
+	-- Get the current buffer and see if it's still big enough
+	current_buffer <- liftIO $ readIORef buffer
+	sw <- Cairo.imageSurfaceGetWidth current_buffer
+	sh <- Cairo.imageSurfaceGetHeight current_buffer
+	-- Get the current drawwindow and its size
+	dw <- EventM.eventWindow
+	(w, h) <- liftIO $ Gtk.drawableGetSize dw
+	when (w > sw || h > sh) $ liftIO $ do
+		-- Buffer is too small, expand it.
+		new_buffer <- Cairo.createImageSurface Cairo.FormatARGB32 w h
+		-- Fill it with white and copy the old buffer
+		Cairo.renderWith new_buffer $ do
+			Cairo.setSourceRGB 1 1 1
+			Cairo.paint
+			Cairo.setSourceSurface current_buffer 0 0
+			Cairo.paint
+		-- Clean up the old buffer
+		Cairo.surfaceFinish current_buffer
+		-- Store and return the new buffer
+		writeIORef buffer new_buffer
+	return True -- No clue what this means
+				
+
 {-
 runGUI s IS {..} = do
 	sFrame <- frame