From caf54844deaac2fbe503c36636149ac76157f7ae Mon Sep 17 00:00:00 2001 From: Junkui Zhang <364772080@qq.com> Date: Wed, 11 Jun 2025 16:33:11 +0800 Subject: [PATCH] remove international keycodes --- crates/gpui/src/platform/keyboard.rs | 4 ---- crates/gpui/src/platform/keycode.rs | 6 ------ crates/gpui/src/platform/linux/keyboard.rs | 4 ---- crates/gpui/src/platform/mac/keyboard.rs | 4 ---- crates/gpui/src/platform/windows/keyboard.rs | 2 -- 5 files changed, 20 deletions(-) diff --git a/crates/gpui/src/platform/keyboard.rs b/crates/gpui/src/platform/keyboard.rs index 93287bd218..e70b7ecdab 100644 --- a/crates/gpui/src/platform/keyboard.rs +++ b/crates/gpui/src/platform/keyboard.rs @@ -99,10 +99,6 @@ mod tests { fn test_scan_code_to_key() { let mapper = TestKeyboardMapper::new(); for scan_code in ScanCode::iter() { - // The IntlBackslash and IntlRo keys are not mapped to any key on US layout - if scan_code == ScanCode::IntlBackslash || scan_code == ScanCode::IntlRo { - continue; - } let mut modifiers = Modifiers::default(); let key = mapper.scan_code_to_key(scan_code, &mut modifiers).unwrap(); assert_eq!(key, scan_code.to_key(false)); diff --git a/crates/gpui/src/platform/keycode.rs b/crates/gpui/src/platform/keycode.rs index d9d76e41e5..6101867261 100644 --- a/crates/gpui/src/platform/keycode.rs +++ b/crates/gpui/src/platform/keycode.rs @@ -148,10 +148,6 @@ pub enum ScanCode { Period, /// Slash key on the main keyboard: / Slash, - /// This key is typically located near LeftShift key, varies on international keyboards: Dan: <> Dutch: ][ Ger: <> UK: \| - IntlBackslash, - /// Used for Brazilian /? and Japanese _ 'ro'. - IntlRo, /// Left arrow key Left, @@ -574,8 +570,6 @@ impl ScanCode { "/" } } - // Standard US keyboard layout does not have these keys, so we return "unknown". - ScanCode::IntlBackslash | ScanCode::IntlRo => "unknown", ScanCode::Left => "left", ScanCode::Up => "up", ScanCode::Right => "right", diff --git a/crates/gpui/src/platform/linux/keyboard.rs b/crates/gpui/src/platform/linux/keyboard.rs index 7c278f8cec..3c94382df0 100644 --- a/crates/gpui/src/platform/linux/keyboard.rs +++ b/crates/gpui/src/platform/linux/keyboard.rs @@ -174,8 +174,6 @@ const TYPEABLE_CODES: &[u32] = &[ 0x003b, // , Comma 0x003c, // . Period 0x003d, // / Slash - 0x005e, // \ IntlBackslash - 0x0061, // ro IntlRo ]; #[cfg(any(feature = "wayland", feature = "x11"))] @@ -253,8 +251,6 @@ fn get_scan_code(scan_code: ScanCode) -> Option { ScanCode::Comma => 0x003b, ScanCode::Period => 0x003c, ScanCode::Slash => 0x003d, - ScanCode::IntlBackslash => 0x005e, - ScanCode::IntlRo => 0x0061, ScanCode::Left => 0x0071, ScanCode::Up => 0x006f, ScanCode::Right => 0x0072, diff --git a/crates/gpui/src/platform/mac/keyboard.rs b/crates/gpui/src/platform/mac/keyboard.rs index 534afa145d..da64583565 100644 --- a/crates/gpui/src/platform/mac/keyboard.rs +++ b/crates/gpui/src/platform/mac/keyboard.rs @@ -260,8 +260,6 @@ const TYPEABLE_CODES: &[u16] = &[ 0x002b, // , Comma 0x002f, // . Period 0x002c, // / Slash - 0x000a, // Non-US \ International backslash - 0x005e, // Non-US Ro International Ro ]; fn get_scan_code(scan_code: ScanCode) -> Option { @@ -335,8 +333,6 @@ fn get_scan_code(scan_code: ScanCode) -> Option { ScanCode::Comma => 0x002b, ScanCode::Period => 0x002f, ScanCode::Slash => 0x002c, - ScanCode::IntlBackslash => 0x000a, - ScanCode::IntlRo => 0x005e, ScanCode::Left => 0x007b, ScanCode::Up => 0x007e, ScanCode::Right => 0x007c, diff --git a/crates/gpui/src/platform/windows/keyboard.rs b/crates/gpui/src/platform/windows/keyboard.rs index efcf36ec6f..37dea76ed4 100644 --- a/crates/gpui/src/platform/windows/keyboard.rs +++ b/crates/gpui/src/platform/windows/keyboard.rs @@ -212,8 +212,6 @@ fn get_virtual_key_from_scan_code(gpui_scan_code: ScanCode) -> Result<(u32, VIRT ScanCode::Comma => 0x0033, ScanCode::Period => 0x0034, ScanCode::Slash => 0x0035, - ScanCode::IntlBackslash => 0x0056, - ScanCode::IntlRo => 0x0073, _ => anyhow::bail!("Unsupported scan code: {:?}", gpui_scan_code), }; let virtual_key = unsafe { MapVirtualKeyW(scan_code, MAPVK_VSC_TO_VK) };