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

terminal: ensure 'has_bg' is set in eraseDisplay

Browse Source 
Add a check for 'has_bg', and if it is set retain the background color.
If it isn't set, we are safe to set the pen to it's default.

Fixes: alacritty/colored_reset
This commit is contained in:
Tim Culverhouse
2023-09-23 00:31:14 -05:00
parent b627cca34b
commit 2051e6bb3a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/terminal/Terminal.zig
View File

@ -1028,8 +1028,13 @@ pub fn eraseDisplay(
defer tracy.end();
// Erasing clears all attributes / colors _except_ the background
const bg = self.screen.cursor.pen.bg;
self.screen.cursor.pen = .{ .bg = bg };
switch (self.screen.cursor.pen.attrs.has_bg) {
true => {
const bg = self.screen.cursor.pen.bg;
self.screen.cursor.pen = .{ .bg = bg, .attrs = .{ .has_bg = true } };
},
false => self.screen.cursor.pen = .{},
}
switch (mode) {
.complete => {
@ -1118,9 +1123,7 @@ test "Terminal: eraseDisplay above" {
.char = 'a',
.bg = pink,
.fg = pink,
.attrs = .{
.bold = true,
},
.attrs = .{ .bold = true, .has_bg = true },
};
const cell_ptr = t.screen.getCellPtr(.active, 0, 0);
cell_ptr.* = t.screen.cursor.pen;
@ -1141,6 +1144,7 @@ test "Terminal: eraseDisplay above" {
try testing.expect(cell.fg.eql(.{}));
try testing.expect(cell.char == 0);
try testing.expect(!cell.attrs.bold);
try testing.expect(cell.attrs.has_bg);
// check that another cell got the correct bg
cell = t.screen.getCell(.active, 0, 1);
@ -1156,9 +1160,7 @@ test "Terminal: eraseDisplay below" {
.char = 'a',
.bg = pink,
.fg = pink,
.attrs = .{
.bold = true,
},
.attrs = .{ .bold = true, .has_bg = true },
};
const cell_ptr = t.screen.getCellPtr(.active, 60, 60);
cell_ptr.* = t.screen.cursor.pen;
@ -1176,6 +1178,7 @@ test "Terminal: eraseDisplay below" {
try testing.expect(cell.fg.eql(.{}));
try testing.expect(cell.char == 0);
try testing.expect(!cell.attrs.bold);
try testing.expect(cell.attrs.has_bg);
// check that another cell got the correct bg
cell = t.screen.getCell(.active, 0, 1);
@ -1191,9 +1194,7 @@ test "Terminal: eraseDisplay complete" {
.char = 'a',
.bg = pink,
.fg = pink,
.attrs = .{
.bold = true,
},
.attrs = .{ .bold = true, .has_bg = true },
};
var cell_ptr = t.screen.getCellPtr(.active, 60, 60);
cell_ptr.* = t.screen.cursor.pen;
@ -1221,11 +1222,13 @@ test "Terminal: eraseDisplay complete" {
try testing.expect(cell.fg.eql(.{}));
try testing.expect(cell.char == 0);
try testing.expect(!cell.attrs.bold);
try testing.expect(cell.attrs.has_bg);
cell = t.screen.getCell(.active, 0, 0);
try testing.expect(cell.bg.eql(pink));
try testing.expect(cell.fg.eql(.{}));
try testing.expect(cell.char == 0);
try testing.expect(!cell.attrs.bold);
try testing.expect(cell.attrs.has_bg);
}
/// Erase the line.