mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 13:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Honor ⌘ when Dvorak-QWERTY is used

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-22 14:52:24 +02:00
parent 136550de9f
commit 622596619c
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crates/gpui/src/platform/mac/event.rs
View file

@ -211,13 +211,14 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
let alt = modifiers.contains(NSEventModifierFlags::NSAlternateKeyMask); let alt = modifiers.contains(NSEventModifierFlags::NSAlternateKeyMask);
let mut shift = modifiers.contains(NSEventModifierFlags::NSShiftKeyMask); let mut shift = modifiers.contains(NSEventModifierFlags::NSShiftKeyMask);
let cmd = modifiers.contains(NSEventModifierFlags::NSCommandKeyMask); let cmd = modifiers.contains(NSEventModifierFlags::NSCommandKeyMask);
let unmodified_chars =
let chars =
CStr::from_ptr(native_event.charactersIgnoringModifiers().UTF8String() as *mut c_char) CStr::from_ptr(native_event.charactersIgnoringModifiers().UTF8String() as *mut c_char)
.to_str() .to_str()
.unwrap(); .unwrap();
#[allow(non_upper_case_globals)] #[allow(non_upper_case_globals)]
let key = match unmodified_chars.chars().next().map(|ch| ch as u16) { let key = match chars.chars().next().map(|ch| ch as u16) {
Some(SPACE_KEY) => "space", Some(SPACE_KEY) => "space",
Some(BACKSPACE_KEY) => "backspace", Some(BACKSPACE_KEY) => "backspace",
Some(ENTER_KEY) | Some(NUMPAD_ENTER_KEY) => "enter", Some(ENTER_KEY) | Some(NUMPAD_ENTER_KEY) => "enter",
@ -244,26 +245,37 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
Some(NSF11FunctionKey) => "f11", Some(NSF11FunctionKey) => "f11",
Some(NSF12FunctionKey) => "f12", Some(NSF12FunctionKey) => "f12",
_ => { _ => {
if shift { let chars_without_modifiers: id = msg_send![
let chars_without_shift: id = msg_send![ native_event,
native_event, charactersByApplyingModifiers: NSEventModifierFlags::empty()
charactersByApplyingModifiers: NSEventModifierFlags::empty() ];
]; let chars_without_modifiers =
let chars_without_shift = CStr::from_ptr(chars_without_modifiers.UTF8String() as *mut c_char)
CStr::from_ptr(chars_without_shift.UTF8String() as *mut c_char) .to_str()
.to_str() .unwrap();
.unwrap();
if chars_without_shift == unmodified_chars.to_ascii_lowercase() { let chars_with_cmd: id = msg_send![
chars_without_shift native_event,
} else if chars_without_shift != unmodified_chars { charactersByApplyingModifiers: NSEventModifierFlags::NSCommandKeyMask
];
let chars_with_cmd = CStr::from_ptr(chars_with_cmd.UTF8String() as *mut c_char)
.to_str()
.unwrap();
if cmd && chars_without_modifiers != chars_with_cmd {
// Honor ⌘ when Dvorak-QWERTY is used.
chars_with_cmd
} else if shift {
if chars_without_modifiers == chars.to_ascii_lowercase() {
chars_without_modifiers
} else if chars_without_modifiers != chars {
shift = false; shift = false;
unmodified_chars chars
} else { } else {
unmodified_chars chars
} }
} else { } else {
unmodified_chars chars
} }
} }
}; };