From 61f6400675b065bf8f801816ed78c1f3206bcc06 Mon Sep 17 00:00:00 2001 From: Ogulcan Celik Date: Sun, 26 Jul 2026 15:05:28 +0300 Subject: fix: repaint after transient terminal resizes --- src/client/mod.rs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/mod.rs b/src/client/mod.rs index 787c0c0b..6be41c06 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -1502,6 +1502,8 @@ async fn run_client_loop( } ClientLoopEvent::Resize(new_cols, new_rows, cell_width_px, cell_height_px) => { state.reported_size = (new_cols, new_rows); + // Resizing invalidates the host-side blit baseline. + state.request_repaint(); let msg = ClientMessage::Resize { cols: new_cols, rows: new_rows, @@ -2099,7 +2101,16 @@ fn current_terminal_geometry(kitty_graphics_enabled: bool) -> (u16, u16, u32, u3 ) } -/// Polls the terminal size and sends resize events when it changes. +/// Reports polled changes and signalled resizes that return to the same size. +fn resize_report_required( + signalled: bool, + new_size: (u16, u16, u32, u32), + last_size: (u16, u16, u32, u32), +) -> bool { + signalled || new_size != last_size +} + +/// Watches the terminal size and sends resize events when it changes. fn resize_poll_loop( resize_tx: tokio::sync::mpsc::Sender, initial_cols: u16, @@ -2107,6 +2118,7 @@ fn resize_poll_loop( kitty_graphics_enabled: bool, should_quit: &Arc, ) { + crate::platform::watch_terminal_resize_signal(); let (_, _, initial_cell_width, initial_cell_height) = current_terminal_geometry(kitty_graphics_enabled); let mut last_size = ( @@ -2117,8 +2129,9 @@ fn resize_poll_loop( ); while !should_quit.load(Ordering::Acquire) { std::thread::sleep(Duration::from_millis(100)); + let signalled = crate::platform::take_terminal_resize_signal(); let new_size = current_terminal_geometry(kitty_graphics_enabled); - if new_size != last_size { + if resize_report_required(signalled, new_size, last_size) { last_size = new_size; if resize_tx .blocking_send(ClientLoopEvent::Resize( @@ -2170,6 +2183,15 @@ mod tests { LOCK.get_or_init(|| Mutex::new(())) } + #[test] + fn resize_signal_reports_even_when_polled_size_is_unchanged() { + let size = (120, 40, 8, 16); + assert!(resize_report_required(true, size, size)); + assert!(!resize_report_required(false, size, size)); + assert!(resize_report_required(false, (120, 41, 8, 16), size)); + assert!(resize_report_required(false, (120, 40, 9, 18), size)); + } + fn restore_env_var(key: &str, value: Option) { if let Some(value) = value { std::env::set_var(key, value); -- cgit v1.2.3