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.

wezterm-gui: overlays with a pinned search bar scroll by whole rows

RoversX807838e7f7ed
diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rs
index 069d148b..0232b66e 100644
--- a/wezterm-gui/src/termwindow/mod.rs
+++ b/wezterm-gui/src/termwindow/mod.rs
@@ -10718,6 +10718,21 @@ impl TermWindow {
self.pane_state(pane_id).viewport_px
}
+ /// The remainder as it is drawn. A copy or quick-select overlay pins
+ /// its search bar to the bottom row of the viewport and hands it over
+ /// as a terminal line, so shifting the rows by the remainder dragged
+ /// the bar up a few pixels and snapped it back at every row. Those
+ /// overlays move a whole row at a time on screen; the remainder keeps
+ /// accumulating underneath so no wheel travel is lost.
+ pub fn drawn_viewport_px(&self, pane: &Arc<dyn Pane>) -> f32 {
+ if pane.downcast_ref::<CopyOverlay>().is_some()
+ || pane.downcast_ref::<QuickSelectOverlay>().is_some()
+ {
+ return 0.0;
+ }
+ self.get_viewport_px(pane.pane_id())
+ }
+
/// The one place the viewport is written. `px` is how far `position`
/// is cut off at its top; it only survives when `position` was taken
/// as given -- a clamp at either end of the scrollback, or following
diff --git a/wezterm-gui/src/termwindow/mouseevent.rs b/wezterm-gui/src/termwindow/mouseevent.rs
index c56e98ed..975156b2 100644
--- a/wezterm-gui/src/termwindow/mouseevent.rs
+++ b/wezterm-gui/src/termwindow/mouseevent.rs
@@ -1765,7 +1765,7 @@ impl super::TermWindow {
let local_x = event.coords.x.sub(pane_left);
// A smooth scroll draws the top row cut off by `viewport_px`, so
// the row under the pointer is that much further down the grid.
- let scroll_px = self.get_viewport_px(pane.pane_id()).round() as isize;
+ let scroll_px = self.drawn_viewport_px(pane).round() as isize;
let local_y = event.coords.y.sub(pane_top + pane_nav_height) + scroll_px;
let x = (local_x.max(0) as f32) / pane_cell_size.width.max(1) as f32;
diff --git a/wezterm-gui/src/termwindow/render/pane.rs b/wezterm-gui/src/termwindow/render/pane.rs
index 9464a8fc..3cfaf4ee 100644
--- a/wezterm-gui/src/termwindow/render/pane.rs
+++ b/wezterm-gui/src/termwindow/render/pane.rs
@@ -1718,7 +1718,7 @@ impl crate::TermWindow {
// too, and the two edge rows are cropped to the pane. The clamp
// in set_viewport_px keeps the extra row inside the terminal.
let scroll_px = match current_viewport {
- Some(_) => self.get_viewport_px(pane_id),
+ Some(_) => self.drawn_viewport_px(&pos.pane),
None => 0.0,
};
let extra_row = if scroll_px > 0.0 { 1 } else { 0 };