X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FPPrac.hs;h=68f5a535bf965038f4190cffeddb6a18eda18d1b;hb=c6b48b290e9bf48d7887286f07b5f2142574b42b;hp=61fd9ef9b183f630a1ead0f1a7611880c950aeac;hpb=e04540efe8801c7462e85906d0c359ad95ad08ef;p=matthijs%2Fprojects%2Ffpprac.git

diff --git a/FPPrac.hs b/FPPrac.hs
index 61fd9ef..68f5a53 100644
--- a/FPPrac.hs
+++ b/FPPrac.hs
@@ -9,6 +9,11 @@ module FPPrac (
 ) where
 
 import qualified Graphics.UI.Gtk as Gtk
+import Graphics.UI.Gtk (AttrOp(..)) -- For the := constructor
+import qualified Graphics.Rendering.Cairo as Cairo
+import qualified Graphics.UI.Gtk.Gdk.EventM as EventM
+
+import Control.Monad.Trans -- for liftIO
 import Data.IORef
 import Control.Applicative
 import Control.Monad
@@ -44,9 +49,6 @@ point, pt :: Int -> Int -> Point
 point = Point
 pt = Point
 
-runTina :: TinaProgram -> IO ()
-runTina p = return ()
-
 data Request
 	= GfxLines      Color   [Point]			-- coloured line through a list of points
 	| GfxPolygon    Color   [Point]			-- filled polygon of given colour
@@ -103,9 +105,6 @@ data IState = forall s. IS
 	, usrState  :: IORef s
 	, usrProg   :: TinaStep s
 	}
-{-
-dbgLog IS {..} s = do
-	return ()
 
 processPostponed :: IState -> IO ()
 processPostponed s@IS {..} = do
@@ -135,12 +134,27 @@ runTina :: TinaProgram -> IO ()
 runTina Main {..} = do
 	usrState  <- newIORef initialState
 	postponed <- newIORef (GfxText (rgb 0 0 0) (pt 50 50) "foo" : GfxClear :initialRequests)
-	let state = IS { sFrame = undefined, sPanel = undefined, buffer = undefined, usrProg = eventHandler, .. }
-	run $ runGUI (sz windowWidth windowHeight) state
-	putStrLn "XX"
-	runGUI (sz windowWidth windowHeight) state
+	let state = IS { usrProg = eventHandler, .. }
+	runGUI {-(sz windowWidth windowHeight) -}state
+
+runGUI :: {-Size ->-} IState -> IO ()
+runGUI s = do
+	-- Init GTK.
+	Gtk.initGUI
+	
+	-- Create a window, which will make the mainloop terminated when
+	-- it is closed.
+	window <- Gtk.windowNew
+	Gtk.set window [ Gtk.containerBorderWidth := 10
+	            , Gtk.windowTitle := "FP Practicum" ]
+	Gtk.onDestroy window Gtk.mainQuit
+	
+	-- Show the window and start the Gtk mainloop.
+	Gtk.widgetShowAll window
+	Gtk.mainGUI
+
 
-runGUI :: Size -> IState -> IO ()
+{-
 runGUI s IS {..} = do
 	sFrame <- frame
 		[ text       := "FP Practicum"
@@ -175,7 +189,6 @@ runGUI s IS {..} = do
 		]
 	windowSetFocus sFrame
 	processPostponed state
-
 onPaint :: IState -> DC a -> Rect -> IO ()
 onPaint IS {..} dest va = do
 	dcBlit dest va buffer (Point 0 0) wxCOPY False >> return ()
@@ -188,14 +201,16 @@ transKey prod  KeyReturn  = prod '\n'
 transKey prod  KeyTab     = prod '\t'
 transKey _ _ = return ()
 
+-}
 
-
-
+{-
 miscHandler s@IS {..} (FRead  fn     ) = Just $ readFile fn >>= post s . FileContents fn
 miscHandler   IS {..} (FWrite fn cnts) = Just $ writeFile fn cnts
 miscHandler   IS {..} ReqQuit = Just $ putStrLn "Quiting" >> wxcAppExit
+-}
 miscHandler   IS {..} _ = Nothing
 
+{-
 winHandler s@IS {..} (WinPrompt st1 st2 st3) = Just $ textDialog sFrame st1 st2 st3 >>= post s . PromptResponse st1 st2
 winHandler   IS {..} (WinTitle     st) = Just $ sFrame `set` [text := st]
 winHandler s@IS {..} (WinMenu      ms) = Just $ mkMenu >>= \ms' -> sFrame `set` [menuBar := ms']
@@ -210,8 +225,10 @@ winHandler s@IS {..} (WinMenu      ms) = Just $ mkMenu >>= \ms' -> sFrame `set`
 				 | item <- items ]
 			return p
 		 | (name,items) <- ms ]
+-}
 winHandler _        _                = Nothing
 
+{-
 gfxHandler IS {..} (GfxLines     col ps)    = Just $ polyline buffer ps [penColor := col] >> dirtyPts sPanel ps
 gfxHandler IS {..} (GfxPolygon   col ps)    = Just $ polygon  buffer ps [penColor := col, brushColor := col] >> dirtyPts sPanel ps
 gfxHandler IS {..} (GfxText      col xy st) = Just $ drawText buffer st xy [textColor := col] >> getTextExtent buffer st >>= dirtyRect' sPanel xy
@@ -221,8 +238,10 @@ gfxHandler IS {..} (GfxDisc      col rt)    = Just $ ellipse buffer rt [penColor
 gfxHandler IS {..} (GfxFont      st  sz)    = Just $ buffer `set` [ fontSize := sz, fontFace := st ]
 gfxHandler IS {..}  GfxClear                = Just $ dcClear buffer >> windowRefresh sPanel False
 gfxHandler IS {..} (GfxPicture   fd  pt)    = Just $ bitmapCreateFromFile fd >>= \bm -> drawBitmap buffer bm pt False [] >> bitmapGetSize bm >>= dirtyRect' sPanel pt
+-}
 gfxHandler _        _                       = Nothing
 
+{-
 dirtyPts :: Window a -> [Point] -> IO ()
 dirtyPts dc ps = dirtyRect' dc (pt x y) Size {..}
 	where