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: clear styles properly for clearing wide spacers

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-21 09:42:13 -07:00
parent 3513b1cdc2
commit 2d8810b4be
1 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/terminal/Terminal.zig
View File

@ -510,7 +510,11 @@ fn printCell(
if (self.screen.cursor.x >= self.cols - 1) break :wide;
const spacer_cell = self.screen.cursorCellRight(1);
spacer_cell.* = .{ .style_id = self.screen.cursor.style_id };
self.screen.clearCells(
&self.screen.cursor.page_pin.page.data,
self.screen.cursor.page_row,
spacer_cell[0..1],
);
if (self.screen.cursor.y > 0 and self.screen.cursor.x <= 1) {
const head_cell = self.screen.cursorCellEndOfPrev();
head_cell.wide = .narrow;
@ -2500,6 +2504,58 @@ test "Terminal: print over wide spacer tail" {
}
}
test "Terminal: print over wide char with bold" {
var t = try init(testing.allocator, .{ .cols = 80, .rows = 80 });
defer t.deinit(testing.allocator);
try t.setAttribute(.{ .bold = {} });
try t.print(0x1F600); // Smiley face
// verify we have styles in our style map
{
const page = t.screen.cursor.page_pin.page.data;
try testing.expectEqual(@as(usize, 1), page.styles.count(page.memory));
}
// Go back and overwrite with no style
t.setCursorPos(0, 0);
try t.setAttribute(.{ .unset = {} });
try t.print('A'); // Smiley face
// verify our style is gone
{
const page = t.screen.cursor.page_pin.page.data;
try testing.expectEqual(@as(usize, 0), page.styles.count(page.memory));
}
}
test "Terminal: print over wide char with bg color" {
var t = try init(testing.allocator, .{ .cols = 80, .rows = 80 });
defer t.deinit(testing.allocator);
try t.setAttribute(.{ .direct_color_bg = .{
.r = 0xFF,
.g = 0,
.b = 0,
} });
try t.print(0x1F600); // Smiley face
// verify we have styles in our style map
{
const page = t.screen.cursor.page_pin.page.data;
try testing.expectEqual(@as(usize, 1), page.styles.count(page.memory));
}
// Go back and overwrite with no style
t.setCursorPos(0, 0);
try t.setAttribute(.{ .unset = {} });
try t.print('A'); // Smiley face
// verify our style is gone
{
const page = t.screen.cursor.page_pin.page.data;
try testing.expectEqual(@as(usize, 0), page.styles.count(page.memory));
}
}
test "Terminal: print multicodepoint grapheme, disabled mode 2027" {
var t = try init(testing.allocator, .{ .cols = 80, .rows = 80 });
defer t.deinit(testing.allocator);