From 05917b27405f797bca817fa68305c08b74897997 Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Wed, 14 Apr 2021 19:39:35 +0000 Subject: Fix initial vi cursor position while in scrollback Fixes #4968. --- alacritty_terminal/src/term/mod.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'alacritty_terminal') diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs index 8d0fc0f8..c4425916 100644 --- a/alacritty_terminal/src/term/mod.rs +++ b/alacritty_terminal/src/term/mod.rs @@ -612,8 +612,15 @@ impl Term { self.mode ^= TermMode::VI; if self.mode.contains(TermMode::VI) { - // Reset vi mode cursor position to match primary cursor. - self.vi_mode_cursor = ViModeCursor::new(self.grid.cursor.point); + let display_offset = self.grid.display_offset() as i32; + if self.grid.cursor.point.line > self.bottommost_line() - display_offset { + // Move cursor to top-left if terminal cursor is not visible. + let point = Point::new(Line(-display_offset), Column(0)); + self.vi_mode_cursor = ViModeCursor::new(point); + } else { + // Reset vi mode cursor position to match primary cursor. + self.vi_mode_cursor = ViModeCursor::new(self.grid.cursor.point); + } } // Update UI about cursor blinking state changes. -- cgit v1.2.3