mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-07-15 16:26:08 +03:00
terminal: more dirty tests
This commit is contained in:
@ -1763,6 +1763,9 @@ pub fn insertBlanks(self: *Terminal, count: usize) void {
|
|||||||
|
|
||||||
// Insert blanks. The blanks preserve the background color.
|
// Insert blanks. The blanks preserve the background color.
|
||||||
self.screen.clearCells(page, self.screen.cursor.page_row, left[0..adjusted_count]);
|
self.screen.clearCells(page, self.screen.cursor.page_row, left[0..adjusted_count]);
|
||||||
|
|
||||||
|
// Our row is always dirty
|
||||||
|
self.screen.cursorMarkDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Removes amount characters from the current cursor position to the right.
|
/// Removes amount characters from the current cursor position to the right.
|
||||||
@ -2137,7 +2140,7 @@ pub fn decaln(self: *Terminal) !void {
|
|||||||
// Move our cursor to the top-left
|
// Move our cursor to the top-left
|
||||||
self.setCursorPos(1, 1);
|
self.setCursorPos(1, 1);
|
||||||
|
|
||||||
// Erase the display which will deallocate graphames, styles, etc.
|
// Erase the display which will deallocate graphemes, styles, etc.
|
||||||
self.eraseDisplay(.complete, false);
|
self.eraseDisplay(.complete, false);
|
||||||
|
|
||||||
// Fill with Es by moving the cursor but reset it after.
|
// Fill with Es by moving the cursor but reset it after.
|
||||||
@ -2159,6 +2162,7 @@ pub fn decaln(self: *Terminal) !void {
|
|||||||
row.styled = true;
|
row.styled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.screen.cursorMarkDirty();
|
||||||
if (self.screen.cursor.y == self.rows - 1) break;
|
if (self.screen.cursor.y == self.rows - 1) break;
|
||||||
self.screen.cursorDown(1);
|
self.screen.cursorDown(1);
|
||||||
}
|
}
|
||||||
@ -6368,8 +6372,15 @@ test "Terminal: deleteLines simple" {
|
|||||||
try t.linefeed();
|
try t.linefeed();
|
||||||
try t.printString("GHI");
|
try t.printString("GHI");
|
||||||
t.setCursorPos(2, 2);
|
t.setCursorPos(2, 2);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(1);
|
t.deleteLines(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);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -6472,8 +6483,15 @@ test "Terminal: deleteLines with scroll region" {
|
|||||||
|
|
||||||
t.setTopAndBottomMargin(1, 3);
|
t.setTopAndBottomMargin(1, 3);
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(1);
|
t.deleteLines(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 } }));
|
||||||
|
|
||||||
try t.print('E');
|
try t.print('E');
|
||||||
t.carriageReturn();
|
t.carriageReturn();
|
||||||
try t.linefeed();
|
try t.linefeed();
|
||||||
@ -6489,7 +6507,6 @@ test "Terminal: deleteLines with scroll region" {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// X
|
|
||||||
test "Terminal: deleteLines with scroll region, large count" {
|
test "Terminal: deleteLines with scroll region, large count" {
|
||||||
const alloc = testing.allocator;
|
const alloc = testing.allocator;
|
||||||
var t = try init(alloc, .{ .cols = 80, .rows = 80 });
|
var t = try init(alloc, .{ .cols = 80, .rows = 80 });
|
||||||
@ -6509,8 +6526,15 @@ test "Terminal: deleteLines with scroll region, large count" {
|
|||||||
|
|
||||||
t.setTopAndBottomMargin(1, 3);
|
t.setTopAndBottomMargin(1, 3);
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(5);
|
t.deleteLines(5);
|
||||||
|
|
||||||
|
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 } }));
|
||||||
|
|
||||||
try t.print('E');
|
try t.print('E');
|
||||||
t.carriageReturn();
|
t.carriageReturn();
|
||||||
try t.linefeed();
|
try t.linefeed();
|
||||||
@ -6526,7 +6550,6 @@ test "Terminal: deleteLines with scroll region, large count" {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// X
|
|
||||||
test "Terminal: deleteLines with scroll region, cursor outside of region" {
|
test "Terminal: deleteLines with scroll region, cursor outside of region" {
|
||||||
const alloc = testing.allocator;
|
const alloc = testing.allocator;
|
||||||
var t = try init(alloc, .{ .cols = 80, .rows = 80 });
|
var t = try init(alloc, .{ .cols = 80, .rows = 80 });
|
||||||
@ -6546,8 +6569,12 @@ test "Terminal: deleteLines with scroll region, cursor outside of region" {
|
|||||||
|
|
||||||
t.setTopAndBottomMargin(1, 3);
|
t.setTopAndBottomMargin(1, 3);
|
||||||
t.setCursorPos(4, 1);
|
t.setCursorPos(4, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(1);
|
t.deleteLines(1);
|
||||||
|
|
||||||
|
for (0..4) |y| try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = y } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -6619,8 +6646,13 @@ test "Terminal: deleteLines left/right scroll region" {
|
|||||||
t.scrolling_region.left = 1;
|
t.scrolling_region.left = 1;
|
||||||
t.scrolling_region.right = 3;
|
t.scrolling_region.right = 3;
|
||||||
t.setCursorPos(2, 2);
|
t.setCursorPos(2, 2);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(1);
|
t.deleteLines(1);
|
||||||
|
|
||||||
|
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
for (1..3) |y| try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = y } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -6643,8 +6675,12 @@ test "Terminal: deleteLines left/right scroll region from top" {
|
|||||||
t.scrolling_region.left = 1;
|
t.scrolling_region.left = 1;
|
||||||
t.scrolling_region.right = 3;
|
t.scrolling_region.right = 3;
|
||||||
t.setCursorPos(1, 2);
|
t.setCursorPos(1, 2);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(1);
|
t.deleteLines(1);
|
||||||
|
|
||||||
|
for (0..3) |y| try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = y } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -6667,8 +6703,13 @@ test "Terminal: deleteLines left/right scroll region high count" {
|
|||||||
t.scrolling_region.left = 1;
|
t.scrolling_region.left = 1;
|
||||||
t.scrolling_region.right = 3;
|
t.scrolling_region.right = 3;
|
||||||
t.setCursorPos(2, 2);
|
t.setCursorPos(2, 2);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.deleteLines(100);
|
t.deleteLines(100);
|
||||||
|
|
||||||
|
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
for (1..3) |y| try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = y } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -7031,6 +7072,8 @@ test "Terminal: DECALN" {
|
|||||||
try testing.expectEqual(@as(usize, 0), t.screen.cursor.y);
|
try testing.expectEqual(@as(usize, 0), t.screen.cursor.y);
|
||||||
try testing.expectEqual(@as(usize, 0), t.screen.cursor.x);
|
try testing.expectEqual(@as(usize, 0), t.screen.cursor.x);
|
||||||
|
|
||||||
|
for (0..t.rows) |y| try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = y } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
defer testing.allocator.free(str);
|
defer testing.allocator.free(str);
|
||||||
@ -7096,7 +7139,11 @@ test "Terminal: insertBlanks" {
|
|||||||
try t.print('B');
|
try t.print('B');
|
||||||
try t.print('C');
|
try t.print('C');
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
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);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7116,7 +7163,10 @@ test "Terminal: insertBlanks pushes off end" {
|
|||||||
try t.print('B');
|
try t.print('B');
|
||||||
try t.print('C');
|
try t.print('C');
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7136,7 +7186,10 @@ test "Terminal: insertBlanks more than size" {
|
|||||||
try t.print('B');
|
try t.print('B');
|
||||||
try t.print('C');
|
try t.print('C');
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(5);
|
t.insertBlanks(5);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7152,7 +7205,10 @@ test "Terminal: insertBlanks no scroll region, fits" {
|
|||||||
|
|
||||||
for ("ABC") |c| try t.print(c);
|
for ("ABC") |c| try t.print(c);
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7198,7 +7254,9 @@ test "Terminal: insertBlanks shift off screen" {
|
|||||||
|
|
||||||
for (" ABC") |c| try t.print(c);
|
for (" ABC") |c| try t.print(c);
|
||||||
t.setCursorPos(1, 3);
|
t.setCursorPos(1, 3);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
try t.print('X');
|
try t.print('X');
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -7216,7 +7274,9 @@ test "Terminal: insertBlanks split multi-cell character" {
|
|||||||
for ("123") |c| try t.print(c);
|
for ("123") |c| try t.print(c);
|
||||||
try t.print('橋');
|
try t.print('橋');
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(1);
|
t.insertBlanks(1);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7235,7 +7295,10 @@ test "Terminal: insertBlanks inside left/right scroll region" {
|
|||||||
t.setCursorPos(1, 3);
|
t.setCursorPos(1, 3);
|
||||||
for ("ABC") |c| try t.print(c);
|
for ("ABC") |c| try t.print(c);
|
||||||
t.setCursorPos(1, 3);
|
t.setCursorPos(1, 3);
|
||||||
|
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
try t.print('X');
|
try t.print('X');
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -7255,7 +7318,9 @@ test "Terminal: insertBlanks outside left/right scroll region" {
|
|||||||
t.scrolling_region.left = 2;
|
t.scrolling_region.left = 2;
|
||||||
t.scrolling_region.right = 4;
|
t.scrolling_region.right = 4;
|
||||||
try testing.expect(t.screen.cursor.pending_wrap);
|
try testing.expect(t.screen.cursor.pending_wrap);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(2);
|
t.insertBlanks(2);
|
||||||
|
try testing.expect(!t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
try testing.expect(!t.screen.cursor.pending_wrap);
|
try testing.expect(!t.screen.cursor.pending_wrap);
|
||||||
try t.print('X');
|
try t.print('X');
|
||||||
|
|
||||||
@ -7275,7 +7340,9 @@ test "Terminal: insertBlanks left/right scroll region large count" {
|
|||||||
t.modes.set(.enable_left_and_right_margin, true);
|
t.modes.set(.enable_left_and_right_margin, true);
|
||||||
t.setLeftAndRightMargin(3, 5);
|
t.setLeftAndRightMargin(3, 5);
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(140);
|
t.insertBlanks(140);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
try t.print('X');
|
try t.print('X');
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -7307,7 +7374,9 @@ test "Terminal: insertBlanks deleting graphemes" {
|
|||||||
try testing.expectEqual(@as(usize, 1), page.graphemeCount());
|
try testing.expectEqual(@as(usize, 1), page.graphemeCount());
|
||||||
|
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(4);
|
t.insertBlanks(4);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
@ -7341,7 +7410,9 @@ test "Terminal: insertBlanks shift graphemes" {
|
|||||||
try testing.expectEqual(@as(usize, 1), page.graphemeCount());
|
try testing.expectEqual(@as(usize, 1), page.graphemeCount());
|
||||||
|
|
||||||
t.setCursorPos(1, 1);
|
t.setCursorPos(1, 1);
|
||||||
|
t.clearDirty();
|
||||||
t.insertBlanks(1);
|
t.insertBlanks(1);
|
||||||
|
try testing.expect(t.isDirty(.{ .active = .{ .x = 0, .y = 0 } }));
|
||||||
|
|
||||||
{
|
{
|
||||||
const str = try t.plainString(testing.allocator);
|
const str = try t.plainString(testing.allocator);
|
||||||
|
Reference in New Issue
Block a user