gloss 1.7.4.1 → 1.7.5.1
raw patch · 8 files changed
+15/−8 lines, 8 filesdep ~bytestringdep ~containersPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: bytestring, containers
API changes (from Hackage documentation)
Files
- Graphics/Gloss/Data/Point.hs +1/−0
- Graphics/Gloss/Internals/Interface/Animate/Timing.hs +1/−0
- Graphics/Gloss/Internals/Interface/Backend/GLFW.hs +6/−2
- Graphics/Gloss/Internals/Interface/Common/Exit.hs +1/−1
- Graphics/Gloss/Internals/Interface/Simulate/Idle.hs +1/−0
- Graphics/Gloss/Internals/Interface/ViewPort/KeyMouse.hs +1/−1
- Graphics/Gloss/Internals/Interface/ViewPort/Motion.hs +1/−1
- gloss.cabal +3/−3
Graphics/Gloss/Data/Point.hs view
@@ -21,6 +21,7 @@ (+) (x1, y1) (x2, y2) = (x1 + x2, y1 + y2) (-) (x1, y1) (x2, y2) = (x1 - x2, y1 - y2) negate (x, y) = (negate x, negate y) + fromInteger x = (fromInteger x, fromInteger x) -- | Test whether a point lies within a rectangular box that is oriented
Graphics/Gloss/Internals/Interface/Animate/Timing.hs view
@@ -1,3 +1,4 @@+{-# LANGUAGE RankNTypes #-} {-# OPTIONS_HADDOCK hide #-} -- | Handles timing of animation.
Graphics/Gloss/Internals/Interface/Backend/GLFW.hs view
@@ -280,13 +280,16 @@ <- setModifiers stateRef key keystate let key' = fromGLFW key let keystate' = if keystate then Down else Up+ let isCharKey (Char _) = True+ isCharKey _ = False -- Call the Gloss KeyMouse actions with the new state.- unless modsSet + unless (modsSet || isCharKey key' && keystate) $ sequence_ $ map (\f -> f key' keystate' mods pos) [f stateRef | KeyMouse f <- callbacks] + setModifiers :: IORef GLFWState -> GLFW.Key -> Bool@@ -447,7 +450,8 @@ go :: IO () go = do windowIsOpen <- GLFW.windowIsOpen when windowIsOpen - $ do dirty <- fmap dirtyScreen $ readIORef stateRef+ $ do GLFW.pollEvents+ dirty <- fmap dirtyScreen $ readIORef stateRef when dirty $ do s <- readIORef stateRef
Graphics/Gloss/Internals/Interface/Common/Exit.hs view
@@ -1,5 +1,5 @@ {-# OPTIONS_HADDOCK hide #-}-{-# LANGUAGE PatternGuards #-}+{-# LANGUAGE PatternGuards, RankNTypes #-} -- | Callback for exiting the program. module Graphics.Gloss.Internals.Interface.Common.Exit
Graphics/Gloss/Internals/Interface/Simulate/Idle.hs view
@@ -1,4 +1,5 @@ {-# OPTIONS_HADDOCK hide #-}+{-# LANGUAGE RankNTypes #-} module Graphics.Gloss.Internals.Interface.Simulate.Idle ( callback_simulate_idle )
Graphics/Gloss/Internals/Interface/ViewPort/KeyMouse.hs view
@@ -1,5 +1,5 @@ {-# OPTIONS_HADDOCK hide #-}-{-# LANGUAGE PatternGuards #-}+{-# LANGUAGE PatternGuards, RankNTypes #-} module Graphics.Gloss.Internals.Interface.ViewPort.KeyMouse (callback_viewPort_keyMouse)
Graphics/Gloss/Internals/Interface/ViewPort/Motion.hs view
@@ -1,5 +1,5 @@ {-# OPTIONS_HADDOCK hide #-}-{-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE ScopedTypeVariables, RankNTypes #-} module Graphics.Gloss.Internals.Interface.ViewPort.Motion (callback_viewPort_motion)
gloss.cabal view
@@ -1,5 +1,5 @@ Name: gloss-Version: 1.7.4.1+Version: 1.7.5.1 License: MIT License-file: LICENSE Author: Ben Lippmeier@@ -37,8 +37,8 @@ Build-Depends: base == 4.*, ghc-prim == 0.2.*,- containers >= 0.3.0 && < 0.5.0,- bytestring == 0.9.*,+ containers >= 0.3 && < 0.6,+ bytestring >= 0.9 && < 0.11, OpenGL == 2.5.*, GLUT == 2.3.*, bmp == 1.2.*