Merge pull request #313 from NuriYuri/add-scan-codes

Make Scancode public and add missing scan field to KeyReleased event
jeremyletang · Aug 16, 2023 · 2247ca4 · 2247ca4
2 parents 2c41c4b + 0b828ac
commit 2247ca4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/examples/pong.rs b/examples/pong.rs
@@ -7,7 +7,7 @@ use {
             Transformable,
         },
         system::{Clock, Time, Vector2f},
-        window::{ContextSettings, Event, Key, Style},
+        window::{ContextSettings, Event, Key, Scancode, Style},
     },
     std::{env, f32::consts::PI},
 };
@@ -134,13 +134,25 @@ fn main() {
                         }
                     }
                 }
-                Event::KeyPressed { code: Key::Up, .. } => up = true,
-                Event::KeyReleased { code: Key::Up, .. } => up = false,
+                Event::KeyPressed { code: Key::Up, .. }
+                | Event::KeyPressed {
+                    scan: Scancode::W, ..
+                } => up = true,
+                Event::KeyReleased { code: Key::Up, .. }
+                | Event::KeyReleased {
+                    scan: Scancode::W, ..
+                } => up = false,
                 Event::KeyPressed {
                     code: Key::Down, ..
+                }
+                | Event::KeyPressed {
+                    scan: Scancode::S, ..
                 } => down = true,
                 Event::KeyReleased {
                     code: Key::Down, ..
+                }
+                | Event::KeyReleased {
+                    scan: Scancode::S, ..
                 } => down = false,
                 _ => {}
             }

diff --git a/src/window/event.rs b/src/window/event.rs
@@ -72,6 +72,8 @@ pub enum Event {
     KeyReleased {
         /// The released key
         code: ffi::Key,
+        /// The scancode of the released key
+        scan: ffi::Scancode,
         /// Is alt released too?
         alt: bool,
         /// Is ctrl released too?
@@ -228,6 +230,7 @@ impl Event {
             },
             EventType::KeyReleased => KeyReleased {
                 code: event.union.key.code,
+                scan: event.union.key.scan,
                 alt: event.union.key.alt,
                 ctrl: event.union.key.control,
                 shift: event.union.key.shift,

diff --git a/src/window/mod.rs b/src/window/mod.rs
@@ -11,6 +11,8 @@ pub use self::{
     window::{Handle, Window},
 };
 
+pub use crate::ffi::window::Scancode;
+
 pub mod clipboard;
 mod context;
 mod context_settings;