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

terminal: use new grapheme break algo

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-02-09 20:31:20 -08:00
parent 132fbb3a46
commit 6f8b4204b9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal/Terminal.zig
View File

@ -6,7 +6,6 @@ const Terminal = @This();
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin"); const builtin = @import("builtin");
const ziglyph = @import("ziglyph");
const testing = std.testing; const testing = std.testing;
const assert = std.debug.assert; const assert = std.debug.assert;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
@ -786,24 +785,19 @@ pub fn print(self: *Terminal, c: u21) !void {
if (prev.cell.char == 0) break :grapheme; if (prev.cell.char == 0) break :grapheme;
const grapheme_break = brk: { const grapheme_break = brk: {
var state: u3 = 0; var state: unicode.GraphemeBreakState = .{};
var cp1: u21 = @intCast(prev.cell.char); var cp1: u21 = @intCast(prev.cell.char);
if (prev.cell.attrs.grapheme) { if (prev.cell.attrs.grapheme) {
var it = row.codepointIterator(prev.x); var it = row.codepointIterator(prev.x);
while (it.next()) |cp2| { while (it.next()) |cp2| {
// log.debug("cp1={x} cp2={x}", .{ cp1, cp2 }); // log.debug("cp1={x} cp2={x}", .{ cp1, cp2 });
assert(!ziglyph.graphemeBreak( assert(!unicode.graphemeBreak(cp1, cp2, &state));
cp1,
cp2,
&state,
));
cp1 = cp2; cp1 = cp2;
} }
} }
// log.debug("cp1={x} cp2={x} end", .{ cp1, c }); // log.debug("cp1={x} cp2={x} end", .{ cp1, c });
break :brk ziglyph.graphemeBreak(cp1, c, &state); break :brk unicode.graphemeBreak(cp1, c, &state);
}; };
// If we can NOT break, this means that "c" is part of a grapheme // If we can NOT break, this means that "c" is part of a grapheme