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

input: fix alt-h on macos

Browse Source 
We'd lost support for send_composed_key_when_X_alt_is_pressed;
this commit restores it.

refs: https://github.com/wez/wezterm/issues/1541
This commit is contained in:
Wez Furlong 2022-01-12 16:46:02 -07:00
parent cefe45d206
commit 35e921b9e6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2019,17 +2019,16 @@ impl WindowView {
modifiers
};
let only_alt = (modifiers & !(Modifiers::LEFT_ALT | Modifiers::RIGHT_ALT | Modifiers::ALT))
== Modifiers::NONE;
let only_left_alt =
(modifiers & !(Modifiers::LEFT_ALT | Modifiers::ALT)) == Modifiers::NONE;
let only_right_alt =
(modifiers & !(Modifiers::RIGHT_ALT | Modifiers::ALT)) == Modifiers::NONE;
// Also respect `send_composed_key_when_(left|right)_alt_is_pressed` configs
// when `use_ime` is true.
let forward_to_ime = {
let only_alt = (modifiers
& !(Modifiers::LEFT_ALT | Modifiers::RIGHT_ALT | Modifiers::ALT))
== Modifiers::NONE;
let only_left_alt =
(modifiers & !(Modifiers::LEFT_ALT | Modifiers::ALT)) == Modifiers::NONE;
let only_right_alt =
(modifiers & !(Modifiers::RIGHT_ALT | Modifiers::ALT)) == Modifiers::NONE;
if modifiers.is_empty() || modifiers == Modifiers::SHIFT {
true
} else if only_left_alt && !send_composed_key_when_left_alt_is_pressed {
@ -2136,7 +2135,15 @@ impl WindowView {
}
if let Some(key) = key_string_to_key_code(chars).or_else(|| key_string_to_key_code(unmod)) {
let (key, raw_key) = if chars.is_empty() || chars == 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)
{
// Take the unmodified key only!
match key_string_to_key_code(unmod) {
Some(key) => (key, None),
None => return,
}
} else if chars.is_empty() || chars == unmod {
(key, None)
} else {
let raw = key_string_to_key_code(unmod);