Fix handling of IME::Commit

alacritty · Mar 23, 2022 · fc0a825 · fc0a825
1 parent 49bfc78
commit fc0a825
Show file tree

Hide file tree

Showing 3 changed files with 130 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alacritty/src/display/mod.rs b/alacritty/src/display/mod.rs
@@ -255,7 +255,12 @@ impl ImeInput {
 
     #[inline]
     pub fn set_enabled(&mut self, is_enabled: bool) {
-        self.is_enabled = is_enabled;
+        if !is_enabled {
+            // Clear state when disabling input method.
+            *self = Default::default();
+        } else {
+            self.is_enabled = true;
+        }
     }
 
     #[inline]

diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs
@@ -1131,7 +1131,12 @@ impl input::Processor<EventProxy, ActionContext<'_, Notifier, EventProxy>> {
                                 let num_cols = self.ctx.terminal.columns() as u32 - 1;
                                 self.ctx.display.damage_from_point(point, num_cols);
                             }
+
+                            // Don't suppress chars for commit.
+                            let mut suppress = false;
+                            mem::swap(self.ctx.suppress_chars, &mut suppress);
                             text.chars().for_each(|ch| self.received_char(ch));
+                            *self.ctx.suppress_chars = suppress;
                         },
                         // This text is being composed, thus should be shown as inline input to
                         // the user.