From f4fef559fb227340e3ed0a942f726f2c3cb9eb66 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 31 Aug 2023 20:41:32 -0700 Subject: [PATCH] terminal: delete lines outside of scroll region should do nothing --- src/terminal/Terminal.zig | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig index 2ea6fc5c5..ac9eb79ef 100644 --- a/src/terminal/Terminal.zig +++ b/src/terminal/Terminal.zig @@ -1425,6 +1425,13 @@ pub fn deleteLines(self: *Terminal, count: usize) !void { const tracy = trace(@src()); defer tracy.end(); + // If our cursor is outside of the scroll region, do nothing. + if (self.screen.cursor.y < self.scrolling_region.top or + self.screen.cursor.y > self.scrolling_region.bottom) + { + return; + } + // Move the cursor to the left margin self.screen.cursor.x = 0; @@ -2132,6 +2139,34 @@ test "Terminal: deleteLines with scroll region, large count" { } } +test "Terminal: deleteLines with scroll region, cursor outside of region" { + const alloc = testing.allocator; + var t = try init(alloc, 80, 80); + defer t.deinit(alloc); + + // Initial value + try t.print('A'); + t.carriageReturn(); + try t.linefeed(); + try t.print('B'); + t.carriageReturn(); + try t.linefeed(); + try t.print('C'); + t.carriageReturn(); + try t.linefeed(); + try t.print('D'); + + t.setScrollingRegion(1, 3); + t.setCursorPos(4, 1); + try t.deleteLines(1); + + { + var str = try t.plainString(testing.allocator); + defer testing.allocator.free(str); + try testing.expectEqualStrings("A\nB\nC\nD", str); + } +} + test "Terminal: insertLines" { const alloc = testing.allocator; var t = try init(alloc, 2, 5);