Add missing #[repr(C)] to SDL_Keysym

This also reverts the change in 9604e85 which just hid the issue.
Rust-SDL2 · Dec 23, 2016 · 5a32976 · 5a32976
1 parent a6d6718
commit 5a32976
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sdl2-sys/src/keyboard.rs b/sdl2-sys/src/keyboard.rs
@@ -8,6 +8,7 @@ use sdl::SDL_bool;
 
 // SDL_keyboard.h
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct SDL_Keysym {
     pub scancode: SDL_Scancode,
     pub sym: SDL_Keycode,

diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
@@ -1298,7 +1298,7 @@ impl Event {
                     window_id: event.windowID,
                     keycode: Keycode::from_i32(event.keysym.sym as i32),
                     scancode: Scancode::from_i32(event.keysym.scancode as i32),
-                    keymod: keyboard::Mod::from_bits_truncate(event.keysym._mod as SDL_Keymod),
+                    keymod: keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap(),
                     repeat: event.repeat != 0
                 }
             }
@@ -1310,7 +1310,7 @@ impl Event {
                     window_id: event.windowID,
                     keycode: Keycode::from_i32(event.keysym.sym as i32),
                     scancode: Scancode::from_i32(event.keysym.scancode as i32),
-                    keymod: keyboard::Mod::from_bits_truncate(event.keysym._mod as SDL_Keymod),
+                    keymod: keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap(),
                     repeat: event.repeat != 0
                 }
             }