Fixes for KeyCode / PhysicalKey split

rust-windowing · Oct 15, 2023 · 21bb990 · 21bb990
1 parent 3e87fe2
commit 21bb990
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/platform_impl/macos/event.rs b/src/platform_impl/macos/event.rs
@@ -176,10 +176,7 @@ pub(crate) fn create_key_event(
         None
     };
 
-    let location = match physical_key {
-        PhysicalKey::Code(code) => code_to_location(code),
-        _ => KeyLocation::Standard,
-    };
+    let location = code_to_location(physical_key);
 
     KeyEvent {
         location,
@@ -198,7 +195,7 @@ pub(crate) fn create_key_event(
 pub fn code_to_key(key: PhysicalKey, scancode: u16) -> Key {
     let code = match key {
         PhysicalKey::Code(code) => code,
-        PhysicalKey::Unidentified(code) => return Key::Unidentified(code),
+        PhysicalKey::Unidentified(code) => return Key::Unidentified(code.into()),
     };
 
     match code {
@@ -258,7 +255,12 @@ pub fn code_to_key(key: PhysicalKey, scancode: u16) -> Key {
     }
 }
 
-pub fn code_to_location(code: KeyCode) -> KeyLocation {
+pub fn code_to_location(key: PhysicalKey) -> KeyLocation {
+    let code = match key {
+        PhysicalKey::Code(code) => code,
+        PhysicalKey::Unidentified(code) => return KeyLocation::Standard,
+    };
+
     match code {
         KeyCode::SuperRight => KeyLocation::Right,
         KeyCode::SuperLeft => KeyLocation::Left,

diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs
@@ -951,7 +951,7 @@ impl WinitView {
                 if phys_mod.contains(ModLocationMask::LEFT) {
                     let mut event = event.clone();
                     event.location = KeyLocation::Left;
-                    event.physical_key = get_left_modifier_code(&event.logical_key);
+                    event.physical_key = get_left_modifier_code(&event.logical_key).into();
                     events.push_back(WindowEvent::KeyboardInput {
                         device_id: DEVICE_ID,
                         event,
@@ -960,7 +960,7 @@ impl WinitView {
                 }
                 if phys_mod.contains(ModLocationMask::RIGHT) {
                     event.location = KeyLocation::Right;
-                    event.physical_key = get_right_modifier_code(&event.logical_key);
+                    event.physical_key = get_right_modifier_code(&event.logical_key).into();
                     events.push_back(WindowEvent::KeyboardInput {
                         device_id: DEVICE_ID,
                         event,

diff --git a/src/platform_impl/windows/event_loop.rs b/src/platform_impl/windows/event_loop.rs
@@ -2512,8 +2512,8 @@ unsafe fn handle_raw_input<T: 'static>(userdata: &ThreadMsgTargetData<T>, data:
             PhysicalKey::from_scancode(scancode as u32)
         };
         if keyboard.VKey == VK_SHIFT {
-            match physical_key {
-                PhysicalKey::Code(code) => match code {
+            if let PhysicalKey::Code(code) = physical_key {
+                match code {
                     KeyCode::NumpadDecimal
                     | KeyCode::Numpad0
                     | KeyCode::Numpad1
@@ -2543,8 +2543,7 @@ unsafe fn handle_raw_input<T: 'static>(userdata: &ThreadMsgTargetData<T>, data:
                         return;
                     }
                     _ => (),
-                },
-                _ => (),
+                }
             }
         }
         userdata.send_event(Event::DeviceEvent {

diff --git a/src/platform_impl/windows/keyboard.rs b/src/platform_impl/windows/keyboard.rs
@@ -658,7 +658,7 @@ impl PartialKeyEventInfo {
         };
 
         KeyEvent {
-            physical_key: self.code,
+            physical_key: self.physical_key,
             logical_key,
             text,
             location: self.location,