Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

scroll down behaves correctly

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-07-10 14:58:10 -07:00
parent 0fc9c956c4
commit d36bf5195c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/terminal/Terminal.zig
View File

@ -300,7 +300,7 @@ pub fn reverseIndex(self: *Terminal) !void {
// TODO: scrolling region // TODO: scrolling region
if (self.cursor.y == 0) { if (self.cursor.y == 0) {
try self.scrollDown(); self.scrollDown(1);
} else { } else {
self.cursor.y -|= 1; self.cursor.y -|= 1;
} }
@ -601,7 +601,7 @@ pub fn linefeed(self: *Terminal) void {
/// All cleared space is colored according to the current SGR state. /// All cleared space is colored according to the current SGR state.
/// ///
/// Moves the cursor to the left margin. /// Moves the cursor to the left margin.
pub fn insertLines(self: *Terminal, alloc: Allocator, count: usize) !void { pub fn insertLines(self: *Terminal, count: usize) void {
// Move the cursor to the left margin // Move the cursor to the left margin
self.cursor.x = 0; self.cursor.x = 0;
@ -627,7 +627,7 @@ pub fn insertLines(self: *Terminal, alloc: Allocator, count: usize) !void {
while (y < self.cursor.y + adjusted_count) : (y += 1) { while (y < self.cursor.y + adjusted_count) : (y += 1) {
var x: usize = 0; var x: usize = 0;
while (x < self.cols) : (x += 1) { while (x < self.cols) : (x += 1) {
const cell = try self.getOrPutCell(alloc, x, y); const cell = self.getOrPutCell(x, y);
cell.* = self.cursor.pen; cell.* = self.cursor.pen;
cell.char = 0; cell.char = 0;
} }
@ -686,13 +686,17 @@ pub fn scrollUp(self: *Terminal) void {
/// Scroll the text down by one row. /// Scroll the text down by one row.
/// TODO: test /// TODO: test
pub fn scrollDown(self: *Terminal) !void { pub fn scrollDown(self: *Terminal, count: usize) void {
const tracy = trace(@src()); const tracy = trace(@src());
defer tracy.end(); defer tracy.end();
self.screen.scroll(.{ .delta = -1 }); // Preserve the cursor
const top = self.screen.getRow(0); const cursor = self.cursor;
for (top) |*cell| cell.char = 0; defer self.cursor = cursor;
// Move to the top of the scroll region
self.cursor.y = self.scrolling_region.top;
self.insertLines(count);
} }
/// Set Top and Bottom Margins If bottom is not specified, 0 or bigger than /// Set Top and Bottom Margins If bottom is not specified, 0 or bigger than
@ -723,11 +727,10 @@ pub fn setScrollingRegion(self: *Terminal, top: usize, bottom: usize) void {
self.setCursorPos(1, 1); self.setCursorPos(1, 1);
} }
fn getOrPutCell(self: *Terminal, alloc: Allocator, x: usize, y: usize) !*Screen.Cell { fn getOrPutCell(self: *Terminal, x: usize, y: usize) *Screen.Cell {
const tracy = trace(@src()); const tracy = trace(@src());
defer tracy.end(); defer tracy.end();
_ = alloc;
return self.screen.getCell(y, x); return self.screen.getCell(y, x);
} }
@ -1007,7 +1010,7 @@ test "Terminal: insertLines" {
t.setCursorPos(2, 1); t.setCursorPos(2, 1);
// Insert two lines // Insert two lines
try t.insertLines(alloc, 2); t.insertLines(2);
{ {
var str = try t.plainString(testing.allocator); var str = try t.plainString(testing.allocator);
@ -1038,7 +1041,7 @@ test "Terminal: insertLines with scroll region" {
t.setScrollingRegion(1, 2); t.setScrollingRegion(1, 2);
t.setCursorPos(1, 1); t.setCursorPos(1, 1);
try t.insertLines(alloc, 1); t.insertLines(1);
try t.print('X'); try t.print('X');
@ -1073,7 +1076,7 @@ test "Terminal: insertLines more than remaining" {
t.setCursorPos(2, 1); t.setCursorPos(2, 1);
// Insert a bunch of lines // Insert a bunch of lines
try t.insertLines(alloc, 20); t.insertLines(20);
{ {
var str = try t.plainString(testing.allocator); var str = try t.plainString(testing.allocator);