@@ -92,7 +92,6 @@ import Data.Text (Text)
9292import Data.Typeable
9393import Foreign hiding (throwIfNeg_ )
9494import Foreign.C
95- import Foreign.Marshal.Array
9695import GHC.Generics (Generic )
9796import SDL.Vect
9897import SDL.Input.Joystick
@@ -684,9 +683,9 @@ convertRaw (Raw.JoyDeviceEvent t ts a) =
684683convertRaw (Raw. ControllerAxisEvent _ ts a b c) =
685684 return (Event ts (ControllerAxisEvent (ControllerAxisEventData a b c)))
686685convertRaw (Raw. ControllerButtonEvent t ts a b _) =
687- return (Event ts
686+ return (Event ts
688687 (ControllerButtonEvent
689- (ControllerButtonEventData a
688+ (ControllerButtonEventData a
690689 (fromNumber $ fromIntegral b)
691690 (fromNumber t))))
692691convertRaw (Raw. ControllerDeviceEvent t ts a) =
@@ -755,9 +754,9 @@ pollEvent =
755754 if n == 0
756755 then return Nothing
757756 else alloca $ \ e -> do
758- n <- Raw. pollEvent e
757+ n' <- Raw. pollEvent e
759758 -- Checking 0 again doesn't hurt and it's good to be safe.
760- if n == 0
759+ if n' == 0
761760 then return Nothing
762761 else fmap Just (peek e >>= convertRaw)
763762
@@ -766,7 +765,7 @@ pollEvent =
766765-- Like 'pollEvent' this function should only be called in the OS thread which
767766-- set the video mode.
768767pollEvents :: MonadIO m => m [Event ]
769- pollEvents = liftIO $ do
768+ pollEvents = liftIO $ do
770769 Raw. pumpEvents
771770 peepAllEvents >>= mapM convertRaw where
772771 peepAllEvents = do
@@ -872,7 +871,7 @@ registerEvent registeredEventDataToEvent eventToRegisteredEventData = do
872871 0 -> return $ EventPushFiltered
873872 _ -> EventPushFailure <$> getError
874873
875- getEv (Event ts (UserEvent (UserEventData typ mWin code d1 d2))) =
874+ getEv (Event ts (UserEvent (UserEventData _typ mWin code d1 d2))) =
876875 registeredEventDataToEvent (RegisteredEventData mWin code d1 d2) ts
877876 getEv _ = return Nothing
878877
@@ -921,6 +920,6 @@ delEventWatch = liftIO . runEventWatchRemoval
921920
922921-- | Checks raw Windows for null references.
923922getWindowFromID :: MonadIO m => Word32 -> m (Maybe Window )
924- getWindowFromID id = do
925- rawWindow <- Raw. getWindowFromID id
923+ getWindowFromID windowId = do
924+ rawWindow <- Raw. getWindowFromID windowId
926925 return $ if rawWindow == nullPtr then Nothing else Just $ Window rawWindow
0 commit comments