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

terminal: dirty tests on t/b/l/r margins

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-04-16 10:48:39 -07:00
parent 981f031951
commit f7a57bd2c8
2 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal/PageList.zig
View File

@ -2999,7 +2999,7 @@ pub const Pin = struct {
/// Mark this pin location as dirty.
/// TODO: test
pub fn markDirty(self: *Pin) void {
pub fn markDirty(self: Pin) void {
var set = self.page.data.dirtyBitSet();
set.set(self.y);
}

86
src/terminal/Terminal.zig
View File

@ -1445,6 +1445,10 @@ pub fn insertLines(self: *Terminal, count: usize) void {
self.rowWillBeShifted(&p.page.data, src);
self.rowWillBeShifted(&dst_p.page.data, dst);
// Mark both our src/dst as dirty
p.markDirty();
dst_p.markDirty();
// If our scrolling region is full width, then we unset wrap.
if (!left_right) {
dst.wrap = false;
@ -1509,6 +1513,9 @@ pub fn insertLines(self: *Terminal, count: usize) void {
while (it.next()) |p| {
const row: *Row = p.rowAndCell().row;
// This row is now dirty
p.markDirty();
// Clear the src row.
const page = &p.page.data;
const cells = page.getCells(row);
@ -1866,6 +1873,9 @@ pub fn eraseChars(self: *Terminal, count_req: usize) void {
break :end end;
};
// Mark our cursor row as dirty
self.screen.cursorMarkDirty();
// Clear the cells
const cells: [*]Cell = @ptrCast(self.screen.cursor.page_cell);
@ -3736,10 +3746,20 @@ test "Terminal: linefeed and carriage return" {
var t = try init(testing.allocator, .{ .cols = 80, .rows = 80 });
defer t.deinit(testing.allocator);
// Basic grid writing
// Print and CR.
for ("hello") |c| try t.print(c);
t.clearDirty();
t.carriageReturn();
// CR should not mark row dirty because it doesn't change rendering.
try testing.expect(!t.isDirty(.{ .screen = .{ .x = 0, .y = 0 } }));
try t.linefeed();
// LF should not mark row dirty
try testing.expect(!t.isDirty(.{ .screen = .{ .x = 0, .y = 0 } }));
try testing.expect(!t.isDirty(.{ .screen = .{ .x = 0, .y = 1 } }));
for ("world") |c| try t.print(c);
try testing.expectEqual(@as(usize, 1), t.screen.cursor.y);
try testing.expectEqual(@as(usize, 5), t.screen.cursor.x);
@ -3757,7 +3777,10 @@ test "Terminal: linefeed unsets pending wrap" {
// Basic grid writing
for ("hello") |c| try t.print(c);
try testing.expect(t.screen.cursor.pending_wrap == true);
t.clearDirty();
try t.linefeed();
try testing.expect(!t.isDirty(.{ .screen = .{ .x = 0, .y = 0 } }));
try testing.expect(!t.isDirty(.{ .screen = .{ .x = 0, .y = 1 } }));
try testing.expect(t.screen.cursor.pending_wrap == false);
}
@ -4132,8 +4155,16 @@ test "Terminal: setTopAndBottomMargin simple" {
try t.linefeed();
try t.printString("GHI");
t.setTopAndBottomMargin(0, 0);
t.clearDirty();
t.scrollDown(1);
// Mark the rows we moved as dirty.
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4154,8 +4185,15 @@ test "Terminal: setTopAndBottomMargin top only" {
try t.linefeed();
try t.printString("GHI");
t.setTopAndBottomMargin(2, 0);
t.clearDirty();
t.scrollDown(1);
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4176,8 +4214,14 @@ test "Terminal: setTopAndBottomMargin top and bottom" {
try t.linefeed();
try t.printString("GHI");
t.setTopAndBottomMargin(1, 2);
t.clearDirty();
t.scrollDown(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4198,8 +4242,15 @@ test "Terminal: setTopAndBottomMargin top equal to bottom" {
try t.linefeed();
try t.printString("GHI");
t.setTopAndBottomMargin(2, 2);
t.clearDirty();
t.scrollDown(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4221,8 +4272,13 @@ test "Terminal: setLeftAndRightMargin simple" {
try t.printString("GHI");
t.modes.set(.enable_left_and_right_margin, true);
t.setLeftAndRightMargin(0, 0);
t.clearDirty();
t.eraseChars(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4247,8 +4303,15 @@ test "Terminal: setLeftAndRightMargin left only" {
try testing.expectEqual(@as(usize, 1), t.scrolling_region.left);
try testing.expectEqual(@as(usize, t.cols - 1), t.scrolling_region.right);
t.setCursorPos(1, 2);
t.clearDirty();
t.insertLines(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4271,8 +4334,15 @@ test "Terminal: setLeftAndRightMargin left and right" {
t.modes.set(.enable_left_and_right_margin, true);
t.setLeftAndRightMargin(1, 2);
t.setCursorPos(1, 2);
t.clearDirty();
t.insertLines(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4295,8 +4365,15 @@ test "Terminal: setLeftAndRightMargin left equal right" {
t.modes.set(.enable_left_and_right_margin, true);
t.setLeftAndRightMargin(2, 2);
t.setCursorPos(1, 2);
t.clearDirty();
t.insertLines(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
@ -4319,8 +4396,15 @@ test "Terminal: setLeftAndRightMargin mode 69 unset" {
t.modes.set(.enable_left_and_right_margin, false);
t.setLeftAndRightMargin(1, 2);
t.setCursorPos(1, 2);
t.clearDirty();
t.insertLines(1);
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 1 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 2 } }));
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 3 } }));
{
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);