Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

handle graphemes with more than 1 joiner

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-09-05 10:35:22 -07:00
parent 47242ad12a
commit 802f230fa2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/terminal/Screen.zig
View File

@ -1497,6 +1497,7 @@ pub fn testWriteString(self: *Screen, text: []const u8) !void {
// Get our row // Get our row
var row = self.getRow(.{ .active = y }); var row = self.getRow(.{ .active = y });
// If we have a previous cell, we check if we're part of a grapheme.
if (grapheme.cell) |prev_cell| { if (grapheme.cell) |prev_cell| {
const grapheme_break = brk: { const grapheme_break = brk: {
var state: i32 = 0; var state: i32 = 0;

27
src/terminal/Terminal.zig
View File

@ -474,22 +474,21 @@ pub fn print(self: *Terminal, c: u21) !void {
}; };
}; };
const grapheme_break = brk: {
var state: i32 = 0; var state: i32 = 0;
const grapheme_break = if (!prev.cell.attrs.grapheme) var cp1 = @intCast(u21, prev.cell.char);
utf8proc.graphemeBreakStateful(@intCast(u21, prev.cell.char), c, &state) if (prev.cell.attrs.grapheme) {
else brk: { var it = row.codepointIterator(prev.x);
// We need to rebuild the state by processing the grapheme breaks while (it.next()) |cp2| {
// for all the codepoints up to this point. This MUST exist because assert(!utf8proc.graphemeBreakStateful(
// grapheme is only true iff this exists. cp1,
const points = self.screen.graphemes.getEntry(row.getId() + prev.x + 1).?; cp2,
const cp1 = switch (points.value_ptr.*) { &state,
.one => |v| one: { ));
assert(!utf8proc.graphemeBreakStateful(@intCast(u21, prev.cell.char), v, &state));
break :one v;
},
else => @panic("NO"), cp1 = cp2;
}; }
}
break :brk utf8proc.graphemeBreakStateful(cp1, c, &state); break :brk utf8proc.graphemeBreakStateful(cp1, c, &state);
}; };