gtk-toy 0.1.1 → 0.2.0

raw patch · 2 files changed

+14/−13 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• gtk-toy.cabal +1/−1
• src/Graphics/UI/Gtk/Toy.hs +13/−12

@@ -1,5 +1,5 @@ Name:                gtk-toy-Version:             0.1.1+Version:             0.2.0 Cabal-Version:       >= 1.6 Synopsis:            Convenient Gtk canvas with mouse and keyboard input. Category:            Graphics, GUI

@@ -13,10 +13,11 @@ -- -- It handles the minutiae of setting up the Gtk window and canvas, and -- processes mouse and keyboard inputs into more palatable data structures.+-- ----------------------------------------------------------------------------- module Graphics.UI.Gtk.Toy-  (-    KeyInfo, KeyTable, MouseEvent, KeyEvent, InputState(..), Interactive(..)+  ( KeyInfo, KeyTable, MouseEvent, KeyEvent, InputState(..)+  , Interactive(..), GtkInteractive(..)   , runToy, quitToy    -- * InputState Accessors@@ -61,17 +62,13 @@ --   provides mouse press information. type MouseEvent = Maybe (Bool, Int) --- | A class for things which can be drawn and change within an interactive---   context.  The default method implementations do nothing.+-- | A class for things which change within an interactive context.  The default+--   method implementations do nothing. class Interactive a where-   -- | @tick@ is (ideally) called every 30ms.  The bool result indicates if the   --   graphics need to be refreshed.   tick                     :: InputState -> a -> IO (a, Bool) -  -- | @display@ is called when the rendering needs to be refreshed.-  display  :: G.DrawWindow -> InputState -> a -> IO a-   -- | @mouse@ is called when the mouse moves or presses occur.   mouse    :: MouseEvent   -> InputState -> a -> IO a @@ -80,13 +77,17 @@    -- No-op defaults.   tick _ = return . (, False)-  display  _ _ = return   mouse    _ _ = return   keyboard _ _ = return +class Interactive a => GtkInteractive a where+  -- | @display@ is called when the rendering needs to be refreshed.+  display  :: G.DrawWindow -> InputState -> a -> IO a+  display _ _ = return+ -- InputState Queries. --- | Gets the information for the most recent key event of the named key.  +-- |  the information for the most recent key event of the named key.   keyInfo :: String -> InputState -> Maybe KeyInfo keyInfo name = M.lookup name . keyTable @@ -96,7 +97,7 @@ keyHeld _ _ = False  -- | Postfixes "_L" and "_R" on the key name, and returns true if either of---   those keys are being held. +--   those keys are being held. eitherHeld :: String -> InputState -> Bool eitherHeld key inp = (keyHeld (key ++ "_L") inp || keyHeld (key ++ "_R") inp) @@ -149,7 +150,7 @@  -- | Main program entrypoint. This is how you turn an instance of Interactive --   into an application.-runToy :: Interactive a => a -> IO ()+runToy :: GtkInteractive a => a -> IO () runToy toy = do   G.initGUI