Allow for events to do io

src/Dodge/Event.hs

@@ -16,7 +16,7 @@ import Dodge.Event.Keyboard
 --import Dodge.Event.Menu
 import Dodge.Data
 import Dodge.Base
-import Dodge.Base.Window
+--import Dodge.Base.Window
 import Dodge.PreloadData
 --import Dodge.Creature.Action
 import Dodge.SoundLogic
@@ -39,15 +39,15 @@ import SDL
 --    Nothing -> Nothing
 --    Just w -> Just $ uv & uvWorld .~ w
 
-handleEvent :: Event -> Universe -> Maybe Universe
+handleEvent :: Event -> Universe -> IO (Maybe Universe)
 handleEvent e = case eventPayload e of
     KeyboardEvent kev           -> handleKeyboardEvent kev
-    MouseMotionEvent mmev       -> handleMouseMotionEvent mmev
-    MouseButtonEvent mbev       -> handleMouseButtonEvent mbev
-    MouseWheelEvent mwev        -> handleMouseWheelEvent mwev
-    WindowSizeChangedEvent sev  -> handleResizeEvent sev
-    WindowMovedEvent mev        -> handleWindowMoveEvent mev
-    _                           -> Just
+    MouseMotionEvent mmev       -> return . handleMouseMotionEvent mmev
+    MouseButtonEvent mbev       -> return . handleMouseButtonEvent mbev
+    MouseWheelEvent mwev        -> return . handleMouseWheelEvent mwev
+    WindowSizeChangedEvent sev  -> return . handleResizeEvent sev
+    WindowMovedEvent mev        -> return . handleWindowMoveEvent mev
+    _                           -> return . Just
 
 handleMouseMotionEvent :: MouseMotionEventData -> Universe -> Maybe Universe
 handleMouseMotionEvent mmev u = Just $ u & uvWorld . mousePos .~ V2
@@ -55,16 +55,15 @@ handleMouseMotionEvent mmev u = Just $ u & uvWorld . mousePos .~ V2
     (0.5*_windowY cfig - fromIntegral y)
   where 
     cfig = _config u
-    w = _uvWorld u
     P (V2 x y) = mouseMotionEventPos mmev
 
 handleMouseButtonEvent :: MouseButtonEventData -> Universe -> Maybe Universe
 handleMouseButtonEvent mbev u = case mouseButtonEventMotion mbev of
-    Released -> Just $ u & uvWorld . mouseButtons %~ S.delete but
-    Pressed  -> handlePressedMouseButton but
-        (u & uvWorld . mouseButtons %~ S.insert but)
+    Released -> Just $ u & updateButtons S.delete
+    Pressed  -> handlePressedMouseButton thebutton $ u & updateButtons S.insert 
   where 
-    but = mouseButtonEventButton mbev
+    thebutton = mouseButtonEventButton mbev
+    updateButtons f = uvWorld . mouseButtons %~ f thebutton
 
 {- | Sets window position in config. -}
 handleWindowMoveEvent :: WindowMovedEventData -> Universe -> Maybe Universe
@@ -81,14 +80,13 @@ handleResizeEvent sev u = Just $ u
     & config . windowY .~ fromIntegral y
     & uvWorld . sideEffects %~ sideEffectUpdatePreload divRes x y
   where 
-    w = _uvWorld u
     x = fromIntegral x'
     y = fromIntegral y'
     V2 x' y' = windowSizeChangedEventSize sev
     divRes = u ^. config . resolution_factor
 
 handlePressedMouseButton :: MouseButton -> Universe -> Maybe Universe
-handlePressedMouseButton but w 
+handlePressedMouseButton but w
     | but == ButtonMiddle || _carteDisplay (_uvWorld w) 
                 = Just $ w & uvWorld . clickMousePos .~ _mousePos (_uvWorld w)
     | otherwise = Just w