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: spacer heads and tails should be codepoint 0, not ' '

Browse Source
This commit is contained in:
Qwerasd
2024-07-08 22:25:39 -04:00
parent 0cee115ba3
commit 730185b212
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/terminal/PageList.zig
View File

@ -5554,7 +5554,7 @@ test "PageList resize (no reflow) more cols with spacer head" {
const rac = page.getRowAndCell(1, 0); const rac = page.getRowAndCell(1, 0);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_head, .wide = .spacer_head,
}; };
} }
@ -5570,7 +5570,7 @@ test "PageList resize (no reflow) more cols with spacer head" {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -5593,7 +5593,7 @@ test "PageList resize (no reflow) more cols with spacer head" {
} }
{ {
const rac = page.getRowAndCell(1, 0); const rac = page.getRowAndCell(1, 0);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.narrow, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.narrow, rac.cell.wide);
} }
{ {
@ -6465,12 +6465,13 @@ test "PageList resize reflow more cols unwrap wide spacer head" {
const rac = page.getRowAndCell(1, 0); const rac = page.getRowAndCell(1, 0);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_head, .wide = .spacer_head,
}; };
} }
{ {
const rac = page.getRowAndCell(0, 1); const rac = page.getRowAndCell(0, 1);
rac.row.wrap_continuation = true;
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = '😀' }, .content = .{ .codepoint = '😀' },
@ -6481,7 +6482,7 @@ test "PageList resize reflow more cols unwrap wide spacer head" {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -6509,7 +6510,7 @@ test "PageList resize reflow more cols unwrap wide spacer head" {
} }
{ {
const rac = page.getRowAndCell(2, 0); const rac = page.getRowAndCell(2, 0);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide);
} }
} }
@ -6542,6 +6543,7 @@ test "PageList resize reflow more cols unwrap wide spacer head across two rows"
} }
{ {
const rac = page.getRowAndCell(0, 1); const rac = page.getRowAndCell(0, 1);
rac.row.wrap_continuation = true;
rac.row.wrap = true; rac.row.wrap = true;
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
@ -6552,12 +6554,13 @@ test "PageList resize reflow more cols unwrap wide spacer head across two rows"
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_head, .wide = .spacer_head,
}; };
} }
{ {
const rac = page.getRowAndCell(0, 2); const rac = page.getRowAndCell(0, 2);
rac.row.wrap_continuation = true;
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = '😀' }, .content = .{ .codepoint = '😀' },
@ -6568,7 +6571,7 @@ test "PageList resize reflow more cols unwrap wide spacer head across two rows"
const rac = page.getRowAndCell(1, 2); const rac = page.getRowAndCell(1, 2);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -6601,7 +6604,7 @@ test "PageList resize reflow more cols unwrap wide spacer head across two rows"
} }
{ {
const rac = page.getRowAndCell(3, 0); const rac = page.getRowAndCell(3, 0);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_head, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_head, rac.cell.wide);
} }
{ {
@ -6611,7 +6614,7 @@ test "PageList resize reflow more cols unwrap wide spacer head across two rows"
} }
{ {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide);
} }
} }
@ -6644,6 +6647,7 @@ test "PageList resize reflow more cols unwrap still requires wide spacer head" {
} }
{ {
const rac = page.getRowAndCell(0, 1); const rac = page.getRowAndCell(0, 1);
rac.row.wrap_continuation = true;
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = '😀' }, .content = .{ .codepoint = '😀' },
@ -6654,7 +6658,7 @@ test "PageList resize reflow more cols unwrap still requires wide spacer head" {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -6692,7 +6696,7 @@ test "PageList resize reflow more cols unwrap still requires wide spacer head" {
} }
{ {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide);
} }
} }
@ -7054,12 +7058,13 @@ test "PageList resize reflow less cols wraps spacer head" {
const rac = page.getRowAndCell(3, 0); const rac = page.getRowAndCell(3, 0);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_head, .wide = .spacer_head,
}; };
} }
{ {
const rac = page.getRowAndCell(0, 1); const rac = page.getRowAndCell(0, 1);
rac.row.wrap_continuation = true;
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = '😀' }, .content = .{ .codepoint = '😀' },
@ -7070,7 +7075,7 @@ test "PageList resize reflow less cols wraps spacer head" {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -7108,7 +7113,7 @@ test "PageList resize reflow less cols wraps spacer head" {
} }
{ {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide);
} }
} }
@ -7552,7 +7557,7 @@ test "PageList resize reflow less cols to eliminate a wide char" {
const rac = page.getRowAndCell(1, 0); const rac = page.getRowAndCell(1, 0);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -7604,7 +7609,7 @@ test "PageList resize reflow less cols to wrap a wide char" {
const rac = page.getRowAndCell(2, 0); const rac = page.getRowAndCell(2, 0);
rac.cell.* = .{ rac.cell.* = .{
.content_tag = .codepoint, .content_tag = .codepoint,
.content = .{ .codepoint = ' ' }, .content = .{ .codepoint = 0 },
.wide = .spacer_tail, .wide = .spacer_tail,
}; };
} }
@ -7637,7 +7642,7 @@ test "PageList resize reflow less cols to wrap a wide char" {
} }
{ {
const rac = page.getRowAndCell(1, 1); const rac = page.getRowAndCell(1, 1);
try testing.expectEqual(@as(u21, ' '), rac.cell.content.codepoint); try testing.expectEqual(@as(u21, 0), rac.cell.content.codepoint);
try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide); try testing.expectEqual(pagepkg.Cell.Wide.spacer_tail, rac.cell.wide);
} }
} }

26
src/terminal/Terminal.zig
View File

@ -343,7 +343,7 @@ pub fn print(self: *Terminal, c: u21) !void {
if (self.screen.cursor.x == right_limit - 1) { if (self.screen.cursor.x == right_limit - 1) {
if (!self.modes.get(.wraparound)) return; if (!self.modes.get(.wraparound)) return;
self.printCell( self.printCell(
' ', 0,
if (right_limit == self.cols) .spacer_head else .narrow, if (right_limit == self.cols) .spacer_head else .narrow,
); );
try self.printWrap(); try self.printWrap();
@ -353,7 +353,7 @@ pub fn print(self: *Terminal, c: u21) !void {
// Write our spacer // Write our spacer
self.screen.cursorRight(1); self.screen.cursorRight(1);
self.printCell(' ', .spacer_tail); self.printCell(0, .spacer_tail);
// Move the cursor again so we're beyond our spacer // Move the cursor again so we're beyond our spacer
if (self.screen.cursor.x == right_limit - 1) { if (self.screen.cursor.x == right_limit - 1) {
@ -478,19 +478,19 @@ pub fn print(self: *Terminal, c: u21) !void {
// We only create a spacer head if we're at the real edge // We only create a spacer head if we're at the real edge
// of the screen. Otherwise, we clear the space with a narrow. // of the screen. Otherwise, we clear the space with a narrow.
// This allows soft wrapping to work correctly. // This allows soft wrapping to work correctly.
self.printCell(' ', if (right_limit == self.cols) .spacer_head else .narrow); self.printCell(0, if (right_limit == self.cols) .spacer_head else .narrow);
try self.printWrap(); try self.printWrap();
} }
self.screen.cursorMarkDirty(); self.screen.cursorMarkDirty();
self.printCell(c, .wide); self.printCell(c, .wide);
self.screen.cursorRight(1); self.screen.cursorRight(1);
self.printCell(' ', .spacer_tail); self.printCell(0, .spacer_tail);
} else { } else {
// This is pretty broken, terminals should never be only 1-wide. // This is pretty broken, terminals should never be only 1-wide.
// We sould prevent this downstream. // We sould prevent this downstream.
self.screen.cursorMarkDirty(); self.screen.cursorMarkDirty();
self.printCell(' ', .narrow); self.printCell(0, .narrow);
}, },
else => unreachable, else => unreachable,
@ -2777,7 +2777,7 @@ test "Terminal: print wide char in single-width terminal" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 0, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 0, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expectEqual(Cell.Wide.narrow, cell.wide); try testing.expectEqual(Cell.Wide.narrow, cell.wide);
} }
@ -2928,7 +2928,7 @@ test "Terminal: print multicodepoint grapheme, disabled mode 2027" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expect(!cell.hasGrapheme()); try testing.expect(!cell.hasGrapheme());
try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide); try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null); try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null);
@ -2945,7 +2945,7 @@ test "Terminal: print multicodepoint grapheme, disabled mode 2027" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 3, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 3, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expect(!cell.hasGrapheme()); try testing.expect(!cell.hasGrapheme());
try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide); try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null); try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null);
@ -2961,7 +2961,7 @@ test "Terminal: print multicodepoint grapheme, disabled mode 2027" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 5, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 5, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expect(!cell.hasGrapheme()); try testing.expect(!cell.hasGrapheme());
try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide); try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null); try testing.expect(list_cell.page.data.lookupGrapheme(cell) == null);
@ -3091,7 +3091,7 @@ test "Terminal: print multicodepoint grapheme, mode 2027" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expect(!cell.hasGrapheme()); try testing.expect(!cell.hasGrapheme());
try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide); try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
} }
@ -3780,7 +3780,7 @@ test "Terminal: print wide char at right margin does not create spacer head" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 4, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 4, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expectEqual(Cell.Wide.narrow, cell.wide); try testing.expectEqual(Cell.Wide.narrow, cell.wide);
const row = list_cell.row; const row = list_cell.row;
@ -7633,7 +7633,7 @@ test "Terminal: deleteLines wide characters split by left/right scroll region bo
{ {
const str = try t.plainString(testing.allocator); const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str); defer testing.allocator.free(str);
try testing.expectEqualStrings("A B A\n ", str); try testing.expectEqualStrings("A B A", str);
} }
} }
@ -8600,7 +8600,7 @@ test "Terminal: deleteChars split wide character from end" {
{ {
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?; const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?;
const cell = list_cell.cell; const cell = list_cell.cell;
try testing.expectEqual(@as(u21, ' '), cell.content.codepoint); try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide); try testing.expectEqual(Cell.Wide.spacer_tail, cell.wide);
} }
} }