Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Honor shift if pressing command switches keyboard

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-25 11:01:38 +02:00
parent ca3e73106c
commit acdfb933e8
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,7 +216,7 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
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 chars_ignoring_modifiers = let mut chars_ignoring_modifiers =
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();
@ -249,14 +249,18 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
Some(NSF11FunctionKey) => "f11", Some(NSF11FunctionKey) => "f11",
Some(NSF12FunctionKey) => "f12", Some(NSF12FunctionKey) => "f12",
_ => { _ => {
let chars_ignoring_modifiers_and_shift = let mut chars_ignoring_modifiers_and_shift =
chars_for_modified_key(native_event.keyCode(), CGEventFlags::empty()); chars_for_modified_key(native_event.keyCode(), false, false);
let chars_with_cmd =
chars_for_modified_key(native_event.keyCode(), CGEventFlags::CGEventFlagCommand); // Honor ⌘ when Dvorak-QWERTY is used.
let chars_with_cmd = chars_for_modified_key(native_event.keyCode(), true, false);
if cmd && chars_ignoring_modifiers_and_shift != chars_with_cmd { if cmd && chars_ignoring_modifiers_and_shift != chars_with_cmd {
// Honor ⌘ when Dvorak-QWERTY is used. chars_ignoring_modifiers =
chars_with_cmd chars_for_modified_key(native_event.keyCode(), true, shift);
} else if shift { chars_ignoring_modifiers_and_shift = chars_with_cmd;
}
if shift {
if chars_ignoring_modifiers_and_shift if chars_ignoring_modifiers_and_shift
== chars_ignoring_modifiers.to_ascii_lowercase() == chars_ignoring_modifiers.to_ascii_lowercase()
{ {
@ -282,7 +286,7 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
} }
} }
fn chars_for_modified_key<'a>(code: CGKeyCode, flags: CGEventFlags) -> &'a str { fn chars_for_modified_key<'a>(code: CGKeyCode, cmd: bool, shift: bool) -> &'a str {
// Ideally, we would use `[NSEvent charactersByApplyingModifiers]` but that // Ideally, we would use `[NSEvent charactersByApplyingModifiers]` but that
// always returns an empty string with certain keyboards, e.g. Japanese. Synthesizing // always returns an empty string with certain keyboards, e.g. Japanese. Synthesizing
// an event with the given flags instead lets us access `characters`, which always // an event with the given flags instead lets us access `characters`, which always
@ -293,7 +297,15 @@ fn chars_for_modified_key<'a>(code: CGKeyCode, flags: CGEventFlags) -> &'a str {
true, true,
) )
.unwrap(); .unwrap();
let mut flags = CGEventFlags::empty();
if cmd {
flags |= CGEventFlags::CGEventFlagCommand;
}
if shift {
flags |= CGEventFlags::CGEventFlagShift;
}
event.set_flags(flags); event.set_flags(flags);
let event: id = unsafe { msg_send![class!(NSEvent), eventWithCGEvent: event] }; let event: id = unsafe { msg_send![class!(NSEvent), eventWithCGEvent: event] };
unsafe { unsafe {
CStr::from_ptr(event.characters().UTF8String()) CStr::from_ptr(event.characters().UTF8String())