Remove unsafe from app layer

17cupsofcoffee · Dec 2, 2024 · 5cfd751 · 5cfd751
1 parent 1773d02
commit 5cfd751
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -1,5 +1,3 @@
-use sdl3_sys::events::SDL_EVENT_QUIT;
-
 use crate::graphics::Graphics;
 use crate::input::{Event, Input};
 use crate::time::Timer;
@@ -69,13 +67,11 @@ impl App {
 
     pub fn handle_events(&mut self, event_handler: &mut impl EventHandler) {
         while let Some(event) = self.window.next_event() {
-            unsafe {
-                if event.r#type == SDL_EVENT_QUIT.0 {
+            if let Some(event) = Event::try_from_sdl_event(&event) {
+                if let Event::Quit = event {
                     self.is_running = false;
                 }
-            }
 
-            if let Some(event) = crate::input::Event::try_from_sdl_event(&event) {
                 self.input.event(&event);
 
                 event_handler.event(self, event);

diff --git a/src/input.rs b/src/input.rs
@@ -47,6 +47,7 @@ impl Input {
             Event::MouseButtonDown(button) => self.mouse_buttons.set_down(*button),
             Event::MouseButtonUp(button) => self.mouse_buttons.set_up(*button),
             Event::MouseMotion { new_position } => self.mouse_position = *new_position,
+
             Event::ControllerDeviceAdded { joystick, gamepad } => {
                 let empty_slot = self.gamepads.iter().position(Option::is_none);
 
@@ -63,21 +64,25 @@ impl Input {
 
                 self.joystick_ids.insert(*joystick, gamepad_id);
             }
+
             Event::ControllerDeviceRemoved { joystick } => {
                 if let Some(gamepad_id) = self.joystick_ids.remove(joystick) {
                     self.gamepads[gamepad_id] = None;
                 }
             }
+
             Event::ControllerButtonDown { joystick, button } => {
                 if let Some(gamepad_id) = self.joystick_ids.get(joystick) {
                     self.gamepad_buttons.set_down((*gamepad_id, *button));
                 }
             }
+
             Event::ControllerButtonUp { joystick, button } => {
                 if let Some(gamepad_id) = self.joystick_ids.get(joystick) {
                     self.gamepad_buttons.set_up((*gamepad_id, *button));
                 }
             }
+
             Event::ControllerAxisMotion {
                 joystick,
                 axis,
@@ -87,7 +92,8 @@ impl Input {
                     self.axes.set_value(*gamepad_id, *axis, *value);
                 }
             }
-            Event::WindowResized { .. } | Event::TextInput { .. } => {}
+
+            _ => {}
         }
     }
 

diff --git a/src/input/event.rs b/src/input/event.rs
@@ -26,6 +26,7 @@ use super::{Gamepad, GamepadAxis, GamepadButton, Key, MouseButton};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum Event {
+    Quit,
     KeyDown(Key),
     KeyUp(Key),
     MouseButtonDown(MouseButton),
@@ -69,6 +70,10 @@ impl Event {
     pub fn try_from_sdl_event(event: &SDL_Event) -> Option<Self> {
         unsafe {
             match SDL_EventType(event.r#type) {
+                SDL_EVENT_QUIT => {
+                    return Some(Event::Quit);
+                }
+
                 SDL_EVENT_KEY_DOWN if !event.key.repeat => {
                     if let Some(key) = Key::from_raw(event.key.scancode) {
                         return Some(Event::KeyDown(key));