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

x11/wayland: avoid including keysym name in compose cursor

Browse Source 
refs: https://github.com/wez/wezterm/issues/4511
This commit is contained in:
Wez Furlong 2024-01-21 15:48:09 -07:00
parent b0671294d1
commit 72fae51b00
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.md
View File

@ -156,6 +156,7 @@ As features stabilize some brief notes about them will accumulate here.
* Incorrect sunset / sunrise progression. Thanks to @mikyk10! #4809 #4810 * Incorrect sunset / sunrise progression. Thanks to @mikyk10! #4809 #4810
* retro tab bar indented too far on macOS when using integrated titlebar buttons. * retro tab bar indented too far on macOS when using integrated titlebar buttons.
Thanks to @0xdead10cd! #4505 Thanks to @0xdead10cd! #4505
* x11/wayland: avoid including keysym name in deadkey compose cursor. #4511
#### Updated #### Updated
* Bundled harfbuzz to 8.3.0 * Bundled harfbuzz to 8.3.0

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

@ -92,17 +92,14 @@ impl Compose {
// we don't have a fantastic way to indicate what is // we don't have a fantastic way to indicate what is
// currently being composed, so we try to get something // currently being composed, so we try to get something
// that might be meaningful by getting the utf8 for that // that might be meaningful by getting the utf8 for that
// key if known, or falling back to the name of the keysym. // key if known.
// The keysym name is likely much wider than the utf8, but // We used to fall back to the name of the keysym, but
// it's probably better than nothing. // feedback was that is was undesirable
// An alternative we could use if folks don't like it is // <https://github.com/wez/wezterm/issues/4511>
// either a space or an underscore.
let key_state = key_state.borrow(); let key_state = key_state.borrow();
let utf8 = key_state.key_get_utf8(xcode); let utf8 = key_state.key_get_utf8(xcode);
if !utf8.is_empty() { if !utf8.is_empty() {
self.composition.push_str(&utf8); self.composition.push_str(&utf8);
} else {
self.composition.push_str(&xkb::keysym_get_name(xsym));
} }
} }
FeedResult::Composing(self.composition.clone()) FeedResult::Composing(self.composition.clone())