From 3595dbb155d692a000d1f556e2e49c8b05ff5c2d Mon Sep 17 00:00:00 2001 From: Michael Sloan Date: Sun, 15 Jun 2025 17:33:44 -0600 Subject: [PATCH] x11: Fix keymap reload to happen on XkbMapNotify not MapNotify (#32771) Keyboard hot reloading was added in #15059, but also reloaded this on MapNotify instead of XkbMapNotify, so it wasn't handling keymap change events and was instead reloading when windows are mapped (typically when they go from a minimized / other workspace state to being visible). Release Notes: - N/A --- crates/gpui/src/platform/linux/x11/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs index 3c2e24b0c9be23de08b1f9313273532a09f6584e..0d4ba42797decd0150b776235e3ee5207086199f 100644 --- a/crates/gpui/src/platform/linux/x11/client.rs +++ b/crates/gpui/src/platform/linux/x11/client.rs @@ -826,7 +826,7 @@ impl X11Client { self.reset_ime(); window.handle_ime_delete(); } - Event::XkbNewKeyboardNotify(_) | Event::MapNotify(_) => { + Event::XkbNewKeyboardNotify(_) | Event::XkbMapNotify(_) => { let mut state = self.0.borrow_mut(); let xkb_state = { let xkb_keymap = xkbc::x11::keymap_new_from_device(