wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-25 14:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Revert "x11: scope the cyrillic ctrl-c workaround to cyrillic"

Browse Source 
This reverts commit 15da2e64c2.

Let's back this out; I think I was too hasty and didn't fully
compare behavior with xterm prior to working on this.

refs: https://github.com/wez/wezterm/issues/4933
This commit is contained in:
Wez Furlong 2024-02-02 10:59:40 -07:00
parent 15da2e64c2
commit 8536d1313c
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.md
View File

@ -37,8 +37,6 @@ As features stabilize some brief notes about them will accumulate here.
path to the command would fail with an obscure error message. #4920
* x11: incorrect handling of the space key when `grp:win_space_toggle`
was enabled via `setxkbmap`. #4910
* x11: ctrl/shift/alt-modified punctuation could expand to the US-english
version of a key. #4933
### 20240128-202157-1e552d76

10
window/src/os/x11/keyboard.rs
View File

@ -368,12 +368,6 @@ impl KeyboardWithFallback {
let key_code_from_sym =
keysym_to_keycode(sym.into()).or_else(|| keysym_to_keycode(xsym.into()));
fn is_cyrillic(c: char) -> bool {
// <https://en.wikipedia.org/wiki/Cyrillic_script_in_Unicode>
let c = c as u32;
c >= 0x400 && c <= 0x52f
}
// If we have a modified key, and its expansion is non-ascii, such as cyrillic
// "Es" (which appears visually similar to "c" in latin texts), then consider
// this key expansion against the default latin layout.
@ -384,8 +378,8 @@ impl KeyboardWithFallback {
.intersects(Modifiers::CTRL | Modifiers::ALT | Modifiers::SUPER)
{
match key_code_from_sym {
Some(crate::KeyCode::Char(c)) if is_cyrillic(c) => {
// A Cyrillic layout.
Some(crate::KeyCode::Char(c)) if !c.is_ascii() => {
// Potentially a Cyrillic or other non-european layout.
// Consider shortcuts like CTRL-C against the default
// latin layout
match fallback_feed {