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: deleteChars should not split wide char cursor x

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-20 20:17:35 -07:00
parent a7f74a9dd6
commit cc75cc9980
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/terminal/Terminal.zig
View File

@ -1604,6 +1604,16 @@ pub fn deleteChars(self: *Terminal, count: usize) void {
self.screen.clearCells(page, self.screen.cursor.page_row, wide[0..2]);
}
// If our first cell is a wide char then we need to also clear
// the spacer tail following it.
if (x[0].wide == .wide) {
self.screen.clearCells(
page,
self.screen.cursor.page_row,
x[0..2],
);
}
while (@intFromPtr(x) <= @intFromPtr(right)) : (x += 1) {
const src: *Cell = @ptrCast(x + count);
const dst: *Cell = @ptrCast(x);
@ -6539,7 +6549,7 @@ test "Terminal: deleteChars inside scroll region" {
}
}
test "Terminal: deleteChars split wide character" {
test "Terminal: deleteChars split wide character from spacer tail" {
const alloc = testing.allocator;
var t = try init(alloc, .{ .cols = 6, .rows = 10 });
defer t.deinit(alloc);
@ -6555,6 +6565,29 @@ test "Terminal: deleteChars split wide character" {
}
}
test "Terminal: deleteChars split wide character from wide" {
const alloc = testing.allocator;
var t = try init(alloc, .{ .cols = 6, .rows = 10 });
defer t.deinit(alloc);
try t.printString("橋123");
t.setCursorPos(1, 1);
t.deleteChars(1);
{
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 0, .y = 0 } }).?;
const cell = list_cell.cell;
try testing.expectEqual(@as(u21, 0), cell.content.codepoint);
try testing.expectEqual(Cell.Wide.narrow, cell.wide);
}
{
const list_cell = t.screen.pages.getCell(.{ .screen = .{ .x = 1, .y = 0 } }).?;
const cell = list_cell.cell;
try testing.expectEqual(@as(u21, '1'), cell.content.codepoint);
try testing.expectEqual(Cell.Wide.narrow, cell.wide);
}
}
test "Terminal: deleteChars split wide character tail" {
const alloc = testing.allocator;
var t = try init(alloc, .{ .rows = 5, .cols = 5 });