张小白andKate
fff0ecead1
Closes #36300 This PR follows Windows conventions by introducing `KeybindingKeystroke`, so shortcuts now show up as `ctrl-shift-4` instead of `ctrl-$`. It also fixes issues with keyboard layouts: when `use_key_equivalents` is set to true, keys are remapped based on their virtual key codes. For example, `ctrl-\` on a standard English layout will be mapped to `ctrl-ё` on a Russian layout. Release Notes: - N/A --------- Co-authored-by: Kate <kate@zed.dev>
42 lines
1.2 KiB
Rust
42 lines
1.2 KiB
Rust
use collections::HashMap;
|
|
|
|
use crate::{KeybindingKeystroke, Keystroke};
|
|
|
|
/// A trait for platform-specific keyboard layouts
|
|
pub trait PlatformKeyboardLayout {
|
|
/// Get the keyboard layout ID, which should be unique to the layout
|
|
fn id(&self) -> &str;
|
|
/// Get the keyboard layout display name
|
|
fn name(&self) -> &str;
|
|
}
|
|
|
|
/// A trait for platform-specific keyboard mappings
|
|
pub trait PlatformKeyboardMapper {
|
|
/// Map a key equivalent to its platform-specific representation
|
|
fn map_key_equivalent(
|
|
&self,
|
|
keystroke: Keystroke,
|
|
use_key_equivalents: bool,
|
|
) -> KeybindingKeystroke;
|
|
/// Get the key equivalents for the current keyboard layout,
|
|
/// only used on macOS
|
|
fn get_key_equivalents(&self) -> Option<&HashMap<char, char>>;
|
|
}
|
|
|
|
/// A dummy implementation of the platform keyboard mapper
|
|
pub struct DummyKeyboardMapper;
|
|
|
|
impl PlatformKeyboardMapper for DummyKeyboardMapper {
|
|
fn map_key_equivalent(
|
|
&self,
|
|
keystroke: Keystroke,
|
|
_use_key_equivalents: bool,
|
|
) -> KeybindingKeystroke {
|
|
KeybindingKeystroke::from_keystroke(keystroke)
|
|
}
|
|
|
|
fn get_key_equivalents(&self) -> Option<&HashMap<char, char>> {
|
|
None
|
|
}
|
|
}
|