Remove the state argument from gfxHandler'.

Also fix some alignment and layout issues.

diff --git a/FPPrac.hs b/FPPrac.hs
index fcbf33e15c00def5e1ada934f01a03d24b340cdc..5da734e98aebb4e9917f06b3f444a4d2f1b48afc 100644 (file)
--- a/FPPrac.hs
+++ b/FPPrac.hs
@@ -261,7 +261,7 @@ winHandler s@IS {..} (WinMenu      ms) = Just $ mkMenu >>= \ms' -> sFrame `set`
 -}
 winHandler _        _                = Nothing
 
-gfxHandler s req = case gfxHandler' s req of
+gfxHandler s req = case gfxHandler' req of
        Nothing -> Nothing
        Just render -> Just $ do
                buf <- readIORef (buffer s)
@@ -278,12 +278,14 @@ gfxHandler IS {..} (GfxDisc      col rt)    = Just $ ellipse buffer rt [penColor
 gfxHandler IS {..} (GfxFont      st  sz)    = Just $ buffer `set` [ fontSize := sz, fontFace := st ]
 gfxHandler IS {..} (GfxPicture   fd  pt)    = Just $ bitmapCreateFromFile fd >>= \bm -> drawBitmap buffer bm pt False [] >> bitmapGetSize bm >>= dirtyRect' sPanel pt
 -}
-gfxHandler' IS {..} (GfxText      col (Point x y) st) = Just $ do
+gfxHandler' (GfxText col (Point x y) st) = Just $ do
        setSourceColor col
        Cairo.moveTo (fromIntegral x) (fromIntegral y)
        Cairo.showText st 
-gfxHandler' IS {..}  GfxClear                = Just $ Cairo.setSourceRGB 1 1 1 >> Cairo.paint
-gfxHandler' _        _                       = Nothing
+gfxHandler' GfxClear = Just $ do
+       Cairo.setSourceRGB 1 1 1
+       Cairo.paint
+gfxHandler' _ = Nothing
 
 -- | Sets the source to a pattern fill of the given color
 setSourceColor :: Color -> Cairo.Render ()