Update to work with current GLFW-b (#8)

bsl · Oct 4, 2018 · 58d9aaa · 58d9aaa
1 parent 7f20fa0
commit 58d9aaa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/GLFW-b-demo.cabal b/GLFW-b-demo.cabal
@@ -38,7 +38,7 @@ executable GLFW-b-demo
     Gear
 
   build-depends:
-    GLFW-b       == 1.4.*,
+    GLFW-b       == 3.2.*,
     OpenGL       == 3.0.*,
     base          < 5,
     mtl          == 2.2.*,

diff --git a/src/Main.hs b/src/Main.hs
@@ -8,7 +8,7 @@ import Control.Monad.RWS.Strict  (RWST, ask, asks, evalRWST, get, liftIO, modify
 import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)
 import Data.List                 (intercalate)
 import Data.Maybe                (catMaybes)
-import Text.PrettyPrint
+import Text.PrettyPrint   hiding ((<>))
 
 import qualified Graphics.Rendering.OpenGL as GL
 import qualified Graphics.UI.GLFW          as GLFW
@@ -53,8 +53,8 @@ data Event =
   | EventWindowSize      !GLFW.Window !Int !Int
   | EventWindowClose     !GLFW.Window
   | EventWindowRefresh   !GLFW.Window
-  | EventWindowFocus     !GLFW.Window !GLFW.FocusState
-  | EventWindowIconify   !GLFW.Window !GLFW.IconifyState
+  | EventWindowFocus     !GLFW.Window !Bool
+  | EventWindowIconify   !GLFW.Window !Bool
   | EventFramebufferSize !GLFW.Window !Int !Int
   | EventMouseButton     !GLFW.Window !GLFW.MouseButton !GLFW.MouseButtonState !GLFW.ModifierKeys
   | EventCursorPos       !GLFW.Window !Double !Double
@@ -170,8 +170,8 @@ windowPosCallback       :: TQueue Event -> GLFW.Window -> Int -> Int
 windowSizeCallback      :: TQueue Event -> GLFW.Window -> Int -> Int                                                       -> IO ()
 windowCloseCallback     :: TQueue Event -> GLFW.Window                                                                     -> IO ()
 windowRefreshCallback   :: TQueue Event -> GLFW.Window                                                                     -> IO ()
-windowFocusCallback     :: TQueue Event -> GLFW.Window -> GLFW.FocusState                                                  -> IO ()
-windowIconifyCallback   :: TQueue Event -> GLFW.Window -> GLFW.IconifyState                                                -> IO ()
+windowFocusCallback     :: TQueue Event -> GLFW.Window -> Bool                                                             -> IO ()
+windowIconifyCallback   :: TQueue Event -> GLFW.Window -> Bool                                                             -> IO ()
 framebufferSizeCallback :: TQueue Event -> GLFW.Window -> Int -> Int                                                       -> IO ()
 mouseButtonCallback     :: TQueue Event -> GLFW.Window -> GLFW.MouseButton   -> GLFW.MouseButtonState -> GLFW.ModifierKeys -> IO ()
 cursorPosCallback       :: TQueue Event -> GLFW.Window -> Double -> Double                                                 -> IO ()