mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix keyevent inconsistency between Windows and Linux/Mac

Browse source
This commit is contained in:
Nguyen Duc Toan 2023-09-20 21:37:14 +07:00
parent 91ab4ea676
commit 2376a56125
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
config/src/keymap/key.rs
View file

@ -32,11 +32,25 @@ impl Default for Key {
impl From<KeyEvent> for Key { impl From<KeyEvent> for Key {
fn from(value: KeyEvent) -> Self { fn from(value: KeyEvent) -> Self {
let shift = matches!(value.code, KeyCode::Char(c) if c.is_ascii_uppercase()); /*
On Linx and Mac:
shift + alphabet => uppercase alphabet + SHIFT
shift + non alphabet => shifted non alphabet + NULL
On Windows:
shift + alphabet => uppercase alphabet + SHIFT
shift + non alphabet => shifted non alphabet + SHIFT
So we detect (non alphabet + SHIFT) and change it to (non alphabet + NULL) for consistent
behavior between OSs.
*/
let shift = match (value.code, value.modifiers) {
(KeyCode::Char(c), _) if c.is_ascii_uppercase() => true,
(KeyCode::Char(_), m) if m.contains(KeyModifiers::SHIFT) => false,
(_, m) => m.contains(KeyModifiers::SHIFT),
};
Self { Self {
code: value.code, code: value.code,
shift: shift || value.modifiers.contains(KeyModifiers::SHIFT), shift,
ctrl: value.modifiers.contains(KeyModifiers::CONTROL), ctrl: value.modifiers.contains(KeyModifiers::CONTROL),
alt: value.modifiers.contains(KeyModifiers::ALT), alt: value.modifiers.contains(KeyModifiers::ALT),
} }