leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x11: don't forward key events to IME when it's disabled

Browse source 
Fixes #3815.
This commit is contained in:
Kirill Chibisov 2024-10-13 21:57:02 +03:00 • committed by GitHub
parent 8fe2b62adf
commit c23bed20b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/platform_impl/linux/x11/event_processor.rs
View file

@ -142,8 +142,18 @@ impl EventProcessor {
{
let event_type = xev.get_type();
if self.filter_event(xev) {
if event_type == xlib::KeyPress || event_type == xlib::KeyRelease {
// If we have IME disabled, don't try to `filter_event`, since only IME can consume them
// and forward back. This is not desired for e.g. games since some IMEs may delay the input
// and game can toggle IME back when e.g. typing into some field where latency won't really
// matter.
if event_type == xlib::KeyPress || event_type == xlib::KeyRelease {
let ime = self.target.ime.as_ref();
let window = self.active_window.map(|window| window as XWindow);
let forward_to_ime = ime
.and_then(|ime| window.map(|window| ime.borrow().is_ime_allowed(window)))
.unwrap_or(false);
if forward_to_ime && self.filter_event(xev) {
let xev: &XKeyEvent = xev.as_ref();
if self.xmodmap.is_modifier(xev.keycode as u8) {
// Don't grow the buffer past the `MAX_MOD_REPLAY_LEN`. This could happen
@ -156,7 +166,8 @@ impl EventProcessor {
self.xfiltered_modifiers.push_front(xev.serial);
}
}
return;
} else {
self.filter_event(xev);
}
match event_type {