From e017dc6a5e17c170397d0e00f784bb3ba9980a7d Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 11 Sep 2023 11:16:18 -0600 Subject: [PATCH] Fix ctrl-` on Brazillian too --- crates/gpui/src/platform/mac/window.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index a3d4c39418..e7befc2728 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -991,13 +991,21 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent: // if the IME has changed the key, we'll first emit an event with the character // generated by the IME system; then fallback to the keystroke if that is not // handled. - // (e.g. on a brazillian keyboard to type a quote you type quote then space) - // (e.g. on a czech keyboard typing a $ requires option+shift+4) + // cases that we have working: + // - " on a brazillian layout by typing + // - ctrl-` on a brazillian layout by typing + // - $ on a czech QWERTY layout by typing + // - 4 on a czech QWERTY layout by typing + // - ctrl-4 on a czech QWERTY layout by typing (or ) if ime_text.is_some() && ime_text.as_ref() != Some(&event.keystroke.key) { let event_with_ime_text = KeyDownEvent { is_held: false, keystroke: Keystroke { - ctrl: false, + // we match ctrl because some use-cases need it. + // we don't match alt because it's often used to generate the optional character + // we don't match shift because we're not here with letters (usually) + // we don't match cmd/fn because they don't seem to use IME + ctrl: event.keystroke.ctrl, alt: false, shift: false, cmd: false,