Don't handle text input when IME is being composed

alacritty · Jan 27, 2022 · 1ccdf9e · 1ccdf9e
1 parent bd77486
commit 1ccdf9e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/alacritty/src/display/content.rs b/alacritty/src/display/content.rs
@@ -50,7 +50,7 @@ impl<'a> RenderableContent<'a> {
         // Find terminal cursor shape.
         let cursor_shape = if terminal_content.cursor.shape == CursorShape::Hidden
             || display.cursor_hidden
-            || display.ime_input.is_some()
+            || display.has_ime_input()
             || search_state.regex().is_some()
         {
             CursorShape::Hidden

diff --git a/alacritty/src/display/mod.rs b/alacritty/src/display/mod.rs
@@ -362,6 +362,13 @@ impl Display {
         })
     }
 
+    pub fn has_ime_input(&self) -> bool {
+        match self.ime_input.as_ref() {
+            Some(ime_input) if !ime_input.preedit.is_empty() => true,
+            _ => false,
+        }
+    }
+
     fn new_glyph_cache(
         dpr: f64,
         renderer: &mut QuadRenderer,
@@ -497,8 +504,8 @@ impl Display {
     ) {
         let size_info = &self.size_info;
         let ime_input = match self.ime_input.as_ref() {
-            Some(ime_input) => ime_input,
-            None => {
+            Some(ime_input) if !ime_input.preedit.is_empty() => ime_input,
+            _ => {
                 let ime_popup_point = Point::new(Line(point.line as i32), point.column);
                 self.window.update_ime_position(ime_popup_point, size_info);
                 return;
@@ -691,7 +698,7 @@ impl Display {
                 self.draw_inline_preedit(ime_point, fg, bg, &mut rects, &metrics, config);
 
                 // Push search bar cursor if there's no IME.
-                if self.ime_input.is_none() {
+                if !self.has_ime_input() {
                     let shape = CursorShape::Underline;
                     let cursor = RenderableCursor::new(Point::new(line, column), shape, fg, false);
                     rects.extend(

diff --git a/alacritty/src/input.rs b/alacritty/src/input.rs
@@ -736,6 +736,12 @@ impl<T: EventListener, A: ActionContext<T>> Processor<T, A> {
 
     /// Process key input.
     pub fn key_input(&mut self, input: KeyboardInput) {
+        // Don't process anything if we have IME input.
+        if self.ctx.display().has_ime_input() {
+            *self.ctx.suppress_chars() = true;
+            return;
+        }
+
         // All key bindings are disabled while a hint is being selected.
         if self.ctx.display().hint_state.active() {
             *self.ctx.suppress_chars() = false;