wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-19 02:37:51 +03:00
Code Issues Projects Releases Wiki Activity

macos: more urgh with swapped chars/unmod

Browse Source 
a redo of 81d08325c1, which was a bit
more nuanced. Partially revert the logic from that commit and rephrase
it as factoring out the condition to make that part clearer, but restore
the original action, which is important in order to propagate the
modifiers through.

refs: https://github.com/wez/wezterm/issues/1907#issuecomment-1108797343
This commit is contained in:
Wez Furlong 2022-04-25 19:24:56 -07:00
parent 9f6d2db154
commit bd70cad6fa
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
window/src/os/macos/window.rs
View File

@ -2057,27 +2057,6 @@ impl WindowView {
chars
};
// When both shift and alt are pressed, macos appears to swap `chars` with `unmod`,
// which isn't particularly helpful. eg: ALT+SHIFT+` produces chars='`' and unmod='~'
// In this case, we take the key from unmod.
// We leave `raw` set to None as we want to preserve the value of modifiers.
// <https://github.com/wez/wezterm/issues/1706>.
// We can't do this for every ALT+SHIFT combo, as the weird behavior doesn't
// apply to eg: ALT+SHIFT+789 for Norwegian layouts
// <https://github.com/wez/wezterm/issues/760>
let swap_unmod_and_chars = (modifiers.contains(Modifiers::SHIFT | Modifiers::ALT)
&& virtual_key == kVK_ANSI_Grave)
||
// <https://github.com/wez/wezterm/issues/1907>
(modifiers.contains(Modifiers::SHIFT | Modifiers::CTRL)
&& virtual_key == kVK_ANSI_Slash);
let (unmod, chars) = if swap_unmod_and_chars && !chars.is_empty() && !unmod.is_empty() {
(chars, unmod)
} else {
(unmod, chars)
};
let phys_code = vkey_to_phys(virtual_key);
let raw_key_handled = Handled::new();
let raw_key_event = RawKeyEvent {
@ -2287,6 +2266,21 @@ impl WindowView {
}
}
// When both shift and alt are pressed, macos appears to swap `chars` with `unmod`,
// which isn't particularly helpful. eg: ALT+SHIFT+` produces chars='`' and unmod='~'
// In this case, we take the key from unmod.
// We leave `raw` set to None as we want to preserve the value of modifiers.
// <https://github.com/wez/wezterm/issues/1706>.
// We can't do this for every ALT+SHIFT combo, as the weird behavior doesn't
// apply to eg: ALT+SHIFT+789 for Norwegian layouts
// <https://github.com/wez/wezterm/issues/760>
let swap_unmod_and_chars = (modifiers.contains(Modifiers::SHIFT | Modifiers::ALT)
&& virtual_key == kVK_ANSI_Grave)
||
// <https://github.com/wez/wezterm/issues/1907>
(modifiers.contains(Modifiers::SHIFT | Modifiers::CTRL)
&& virtual_key == kVK_ANSI_Slash);
if let Some(key) = key_string_to_key_code(chars).or_else(|| key_string_to_key_code(unmod)) {
let (key, raw_key) = if (only_left_alt && !send_composed_key_when_left_alt_is_pressed)
|| (only_right_alt && !send_composed_key_when_right_alt_is_pressed)
@ -2298,6 +2292,11 @@ impl WindowView {
}
} else if chars.is_empty() || chars == unmod {
(key, None)
} else if swap_unmod_and_chars {
match key_string_to_key_code(unmod) {
Some(key) => (key, None),
None => return,
}
} else {
let raw = key_string_to_key_code(unmod);
match (&key, &raw) {