From 52c467023770b20a520fa700abbab0d7b2fb785b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Fri, 1 Apr 2022 18:16:59 +0200 Subject: [PATCH] android: Add mapping from NDK Keycode to VirtualKeyCode (#2226) --- CHANGELOG.md | 1 + src/platform_impl/android/mod.rs | 173 ++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0c4298459..c7d66aafb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ And please only add new entries to the top of this list, right below the `# Unre - On Wayland, fix resize and scale factor changes not being propagated properly. - On Wayland, fix polling during consecutive `EventLoop::run_return` invocations. - On Windows, fix race issue creating fullscreen windows with `WindowBuilder::with_fullscreen` +- On Android, `virtual_keycode` for `KeyboardInput` events is now filled in where a suitable match is found. # 0.26.1 (2022-01-05) diff --git a/src/platform_impl/android/mod.rs b/src/platform_impl/android/mod.rs index c9e1220e2b..79894ea034 100644 --- a/src/platform_impl/android/mod.rs +++ b/src/platform_impl/android/mod.rs @@ -2,13 +2,14 @@ use crate::{ dpi::{PhysicalPosition, PhysicalSize, Position, Size}, - error, event, + error, + event::{self, VirtualKeyCode}, event_loop::{self, ControlFlow}, monitor, window, }; use ndk::{ configuration::Configuration, - event::{InputEvent, KeyAction, MotionAction}, + event::{InputEvent, KeyAction, Keycode, MotionAction}, looper::{ForeignLooper, Poll, ThreadLooper}, }; use ndk_glue::{Event, Rect}; @@ -44,6 +45,170 @@ enum EventSource { Internal(InternalEvent), } +fn ndk_keycode_to_virtualkeycode(keycode: Keycode) -> Option { + match keycode { + Keycode::A => Some(VirtualKeyCode::A), + Keycode::B => Some(VirtualKeyCode::B), + Keycode::C => Some(VirtualKeyCode::C), + Keycode::D => Some(VirtualKeyCode::D), + Keycode::E => Some(VirtualKeyCode::E), + Keycode::F => Some(VirtualKeyCode::F), + Keycode::G => Some(VirtualKeyCode::G), + Keycode::H => Some(VirtualKeyCode::H), + Keycode::I => Some(VirtualKeyCode::I), + Keycode::J => Some(VirtualKeyCode::J), + Keycode::K => Some(VirtualKeyCode::K), + Keycode::L => Some(VirtualKeyCode::L), + Keycode::M => Some(VirtualKeyCode::M), + Keycode::N => Some(VirtualKeyCode::N), + Keycode::O => Some(VirtualKeyCode::O), + Keycode::P => Some(VirtualKeyCode::P), + Keycode::Q => Some(VirtualKeyCode::Q), + Keycode::R => Some(VirtualKeyCode::R), + Keycode::S => Some(VirtualKeyCode::S), + Keycode::T => Some(VirtualKeyCode::T), + Keycode::U => Some(VirtualKeyCode::U), + Keycode::V => Some(VirtualKeyCode::V), + Keycode::W => Some(VirtualKeyCode::W), + Keycode::X => Some(VirtualKeyCode::X), + Keycode::Y => Some(VirtualKeyCode::Y), + Keycode::Z => Some(VirtualKeyCode::Z), + + Keycode::Keycode0 => Some(VirtualKeyCode::Key0), + Keycode::Keycode1 => Some(VirtualKeyCode::Key1), + Keycode::Keycode2 => Some(VirtualKeyCode::Key2), + Keycode::Keycode3 => Some(VirtualKeyCode::Key3), + Keycode::Keycode4 => Some(VirtualKeyCode::Key4), + Keycode::Keycode5 => Some(VirtualKeyCode::Key5), + Keycode::Keycode6 => Some(VirtualKeyCode::Key6), + Keycode::Keycode7 => Some(VirtualKeyCode::Key7), + Keycode::Keycode8 => Some(VirtualKeyCode::Key8), + Keycode::Keycode9 => Some(VirtualKeyCode::Key9), + + Keycode::Numpad0 => Some(VirtualKeyCode::Numpad0), + Keycode::Numpad1 => Some(VirtualKeyCode::Numpad1), + Keycode::Numpad2 => Some(VirtualKeyCode::Numpad2), + Keycode::Numpad3 => Some(VirtualKeyCode::Numpad3), + Keycode::Numpad4 => Some(VirtualKeyCode::Numpad4), + Keycode::Numpad5 => Some(VirtualKeyCode::Numpad5), + Keycode::Numpad6 => Some(VirtualKeyCode::Numpad6), + Keycode::Numpad7 => Some(VirtualKeyCode::Numpad7), + Keycode::Numpad8 => Some(VirtualKeyCode::Numpad8), + Keycode::Numpad9 => Some(VirtualKeyCode::Numpad9), + + Keycode::NumpadAdd => Some(VirtualKeyCode::NumpadAdd), + Keycode::NumpadSubtract => Some(VirtualKeyCode::NumpadSubtract), + Keycode::NumpadMultiply => Some(VirtualKeyCode::NumpadMultiply), + Keycode::NumpadDivide => Some(VirtualKeyCode::NumpadDivide), + Keycode::NumpadEnter => Some(VirtualKeyCode::NumpadEnter), + Keycode::NumpadEquals => Some(VirtualKeyCode::NumpadEquals), + Keycode::NumpadComma => Some(VirtualKeyCode::NumpadComma), + Keycode::NumpadDot => Some(VirtualKeyCode::NumpadDecimal), + Keycode::NumLock => Some(VirtualKeyCode::Numlock), + + Keycode::DpadLeft => Some(VirtualKeyCode::Left), + Keycode::DpadRight => Some(VirtualKeyCode::Right), + Keycode::DpadUp => Some(VirtualKeyCode::Up), + Keycode::DpadDown => Some(VirtualKeyCode::Down), + + Keycode::F1 => Some(VirtualKeyCode::F1), + Keycode::F2 => Some(VirtualKeyCode::F2), + Keycode::F3 => Some(VirtualKeyCode::F3), + Keycode::F4 => Some(VirtualKeyCode::F4), + Keycode::F5 => Some(VirtualKeyCode::F5), + Keycode::F6 => Some(VirtualKeyCode::F6), + Keycode::F7 => Some(VirtualKeyCode::F7), + Keycode::F8 => Some(VirtualKeyCode::F8), + Keycode::F9 => Some(VirtualKeyCode::F9), + Keycode::F10 => Some(VirtualKeyCode::F10), + Keycode::F11 => Some(VirtualKeyCode::F11), + Keycode::F12 => Some(VirtualKeyCode::F12), + + Keycode::Space => Some(VirtualKeyCode::Space), + Keycode::Escape => Some(VirtualKeyCode::Escape), + Keycode::Enter => Some(VirtualKeyCode::Return), // not on the Numpad + Keycode::Tab => Some(VirtualKeyCode::Tab), + + Keycode::PageUp => Some(VirtualKeyCode::PageUp), + Keycode::PageDown => Some(VirtualKeyCode::PageDown), + Keycode::MoveHome => Some(VirtualKeyCode::Home), + Keycode::MoveEnd => Some(VirtualKeyCode::End), + Keycode::Insert => Some(VirtualKeyCode::Insert), + + Keycode::Del => Some(VirtualKeyCode::Back), // Backspace (above Enter) + Keycode::ForwardDel => Some(VirtualKeyCode::Delete), // Delete (below Insert) + + Keycode::Copy => Some(VirtualKeyCode::Copy), + Keycode::Paste => Some(VirtualKeyCode::Paste), + Keycode::Cut => Some(VirtualKeyCode::Cut), + + Keycode::VolumeUp => Some(VirtualKeyCode::VolumeUp), + Keycode::VolumeDown => Some(VirtualKeyCode::VolumeDown), + Keycode::VolumeMute => Some(VirtualKeyCode::Mute), // ??? + Keycode::Mute => Some(VirtualKeyCode::Mute), // ??? + Keycode::MediaPlayPause => Some(VirtualKeyCode::PlayPause), + Keycode::MediaStop => Some(VirtualKeyCode::MediaStop), // ??? simple "Stop"? + Keycode::MediaNext => Some(VirtualKeyCode::NextTrack), + Keycode::MediaPrevious => Some(VirtualKeyCode::PrevTrack), + + Keycode::Plus => Some(VirtualKeyCode::Plus), + Keycode::Minus => Some(VirtualKeyCode::Minus), + Keycode::Equals => Some(VirtualKeyCode::Equals), + Keycode::Semicolon => Some(VirtualKeyCode::Semicolon), + Keycode::Slash => Some(VirtualKeyCode::Slash), + Keycode::Backslash => Some(VirtualKeyCode::Backslash), + Keycode::Comma => Some(VirtualKeyCode::Comma), + Keycode::Period => Some(VirtualKeyCode::Period), + Keycode::Apostrophe => Some(VirtualKeyCode::Apostrophe), + Keycode::Grave => Some(VirtualKeyCode::Grave), + Keycode::At => Some(VirtualKeyCode::At), + + // TODO: Maybe mapping this to Snapshot makes more sense? See: "PrtScr/SysRq" + Keycode::Sysrq => Some(VirtualKeyCode::Sysrq), + // These are usually the same (Pause/Break) + Keycode::Break => Some(VirtualKeyCode::Pause), + // These are exactly the same + Keycode::ScrollLock => Some(VirtualKeyCode::Scroll), + + Keycode::Yen => Some(VirtualKeyCode::Yen), + Keycode::Kana => Some(VirtualKeyCode::Kana), + + Keycode::CtrlLeft => Some(VirtualKeyCode::LControl), + Keycode::CtrlRight => Some(VirtualKeyCode::RControl), + + Keycode::ShiftLeft => Some(VirtualKeyCode::LShift), + Keycode::ShiftRight => Some(VirtualKeyCode::RShift), + + Keycode::AltLeft => Some(VirtualKeyCode::LAlt), + Keycode::AltRight => Some(VirtualKeyCode::RAlt), + + // Different names for the same keys + Keycode::MetaLeft => Some(VirtualKeyCode::LWin), + Keycode::MetaRight => Some(VirtualKeyCode::RWin), + + Keycode::LeftBracket => Some(VirtualKeyCode::LBracket), + Keycode::RightBracket => Some(VirtualKeyCode::RBracket), + + Keycode::Power => Some(VirtualKeyCode::Power), + Keycode::Sleep => Some(VirtualKeyCode::Sleep), // what about SoftSleep? + Keycode::Wakeup => Some(VirtualKeyCode::Wake), + + Keycode::NavigateNext => Some(VirtualKeyCode::NavigateForward), + Keycode::NavigatePrevious => Some(VirtualKeyCode::NavigateBackward), + + Keycode::Calculator => Some(VirtualKeyCode::Calculator), + Keycode::Explorer => Some(VirtualKeyCode::MyComputer), // "close enough" + Keycode::Envelope => Some(VirtualKeyCode::Mail), // "close enough" + + Keycode::Star => Some(VirtualKeyCode::Asterisk), // ??? + Keycode::AllApps => Some(VirtualKeyCode::Apps), // ??? + Keycode::AppSwitch => Some(VirtualKeyCode::Apps), // ??? + Keycode::Refresh => Some(VirtualKeyCode::WebRefresh), // ??? + + _ => None, + } +} + fn poll(poll: Poll) -> Option { match poll { Poll::Event { ident, .. } => match ident { @@ -279,7 +444,9 @@ impl EventLoop { input: event::KeyboardInput { scancode: key.scan_code() as u32, state, - virtual_keycode: None, + virtual_keycode: ndk_keycode_to_virtualkeycode( + key.key_code(), + ), modifiers: event::ModifiersState::default(), }, is_synthetic: false,