Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

Hide terminal preedit while sidebar input is focused

RoversXc248f1699bfd
diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rs
index 1398aa93..acb684ba 100644
--- a/wezterm-gui/src/termwindow/mod.rs
+++ b/wezterm-gui/src/termwindow/mod.rs
@@ -6373,6 +6373,19 @@ impl TermWindow {
}
impl TermWindow {
+ /// The IME composing status as the TERMINAL should see it. While a
+ /// sidebar text input (the Note editor, snippet fields, file filter)
+ /// holds keyboard focus, composed text is routed there — the terminal
+ /// cursor must not render a duplicate preedit overlay at the prompt.
+ pub(crate) fn terminal_dead_key_status(&self) -> &DeadKeyStatus {
+ static NONE: DeadKeyStatus = DeadKeyStatus::None;
+ if self.right_sidebar_has_text_focus() {
+ &NONE
+ } else {
+ &self.dead_key_status
+ }
+ }
+
/// Publish this window's per-domain shaping-cache gauges in one batch
/// (single diagnostics lock). Called unthrottled after cache clears and
/// idle releases so the panel never shows stale non-zero values.
diff --git a/wezterm-gui/src/termwindow/render/mod.rs b/wezterm-gui/src/termwindow/render/mod.rs
index 036995ed..94e4372e 100644
--- a/wezterm-gui/src/termwindow/render/mod.rs
+++ b/wezterm-gui/src/termwindow/render/mod.rs
@@ -627,8 +627,8 @@ impl crate::TermWindow {
};
}
- let dead_key_or_leader =
- self.dead_key_status != DeadKeyStatus::None || self.leader_is_active();
+ let dead_key_or_leader = *self.terminal_dead_key_status() != DeadKeyStatus::None
+ || self.leader_is_active();
if dead_key_or_leader && focused_and_active {
let (fg_color, bg_color) = if self.use_reverse_video_cursor(&params) {
diff --git a/wezterm-gui/src/termwindow/render/pane.rs b/wezterm-gui/src/termwindow/render/pane.rs
index db274372..d69bcab6 100644
--- a/wezterm-gui/src/termwindow/render/pane.rs
+++ b/wezterm-gui/src/termwindow/render/pane.rs
@@ -1376,7 +1376,7 @@ impl crate::TermWindow {
y: 0,
..*self.cursor
},
- dead_key_or_leader: self.term_window.dead_key_status
+ dead_key_or_leader: *self.term_window.terminal_dead_key_status()
!= DeadKeyStatus::None
|| self.term_window.leader_is_active(),
cursor_fg: self.cursor_fg,
@@ -1384,7 +1384,10 @@ impl crate::TermWindow {
cursor_border_color: self.cursor_border_color,
cursor_is_default_color: self.cursor_is_default_color,
}),
- match (self.pos.is_active, &self.term_window.dead_key_status) {
+ match (
+ self.pos.is_active,
+ self.term_window.terminal_dead_key_status(),
+ ) {
(true, DeadKeyStatus::Composing(composing)) => {
Some(composing.to_string())
}
@@ -1464,7 +1467,7 @@ impl crate::TermWindow {
font_identity: self.font_identity,
composing: if self.cursor.y == stable_row && self.pos.is_active {
if let DeadKeyStatus::Composing(composing) =
- &self.term_window.dead_key_status
+ self.term_window.terminal_dead_key_status()
{
Some((self.cursor.x, composing.to_string()))
} else {
diff --git a/wezterm-gui/src/termwindow/render/screen_line.rs b/wezterm-gui/src/termwindow/render/screen_line.rs
index 0089687a..8221ee5d 100644
--- a/wezterm-gui/src/termwindow/render/screen_line.rs
+++ b/wezterm-gui/src/termwindow/render/screen_line.rs
@@ -77,7 +77,7 @@ impl crate::TermWindow {
// Referencing the text being composed, but only if it belongs to this pane
let composing = if cursor_idx.is_some() {
- if let DeadKeyStatus::Composing(composing) = &self.dead_key_status {
+ if let DeadKeyStatus::Composing(composing) = self.terminal_dead_key_status() {
Some(composing)
} else {
None