Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Disable the IME on linux/wayland when text input is unexpected (#58237)
feeiyu126c0ee41a38
diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rsindex fc3697a8bb3..a797d0d6d09 100644--- a/crates/gpui_linux/src/linux/wayland/client.rs+++ b/crates/gpui_linux/src/linux/wayland/client.rs@@ -264,6 +264,7 @@ pub(crate) struct WaylandClientState {pending_activation: Option<PendingActivation>,event_loop: Option<EventLoop<'static, WaylandClientStatePtr>>,pub common: LinuxCommon,+ ime_enabled: Option<bool>,}pub struct DragState {@@ -319,6 +320,7 @@ impl WaylandClientStatePtr {pub fn enable_ime(&self) {let client = self.get_client();let mut state = client.borrow_mut();+ state.ime_enabled = Some(true);let Some(text_input) = state.text_input.take() else {return;};@@ -344,6 +346,7 @@ impl WaylandClientStatePtr {pub fn disable_ime(&self) {let client = self.get_client();let mut state = client.borrow_mut();+ state.ime_enabled = Some(false);state.composing = false;if let Some(text_input) = &state.text_input {text_input.disable();@@ -351,6 +354,11 @@ impl WaylandClientStatePtr {}}+ pub fn ime_enabled(&self) -> Option<bool> {+ let client = self.get_client();+ client.borrow().ime_enabled+ }+pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {let client = self.get_client();let state = client.borrow_mut();@@ -723,6 +731,7 @@ impl WaylandClient {cursor,pending_activation: None,event_loop: Some(event_loop),+ ime_enabled: None,}));WaylandSource::new(conn, event_queue)diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rsindex 9d5c85b2058..3cab3e7ea8a 100644--- a/crates/gpui_linux/src/linux/wayland/window.rs+++ b/crates/gpui_linux/src/linux/wayland/window.rs@@ -598,6 +598,27 @@ impl WaylandWindowStatePtr {force_render,..Default::default()});+ self.update_ime_enabled();+ }+ }++ fn update_ime_enabled(&self) {+ let mut state = self.state.borrow_mut();+ let client = state.client.clone();+ let ime_enabled = state+ .input_handler+ .as_mut()+ .map(|input_handler| input_handler.query_accepts_text_input())+ .unwrap_or(true);+ drop(state);+ if Some(ime_enabled) == client.ime_enabled() {+ return;+ }++ if ime_enabled {+ client.enable_ime();+ } else {+ client.disable_ime();}}