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

font/coretext: only pad shaped text ltr

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-05-01 20:27:40 -07:00
parent 0338e09cf9
commit a8b97d4061
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/font/shaper/coretext.zig
View File

@ -210,6 +210,14 @@ pub const Shaper = struct {
pub fn shape(self: *Shaper, run: font.shape.TextRun) ![]const font.shape.Cell { pub fn shape(self: *Shaper, run: font.shape.TextRun) ![]const font.shape.Cell {
const state = &self.run_state; const state = &self.run_state;
// {
// log.debug("shape -----------------------------------", .{});
// for (state.codepoints.items) |entry| {
// log.debug("cp={X} cluster={}", .{ entry.codepoint, entry.cluster });
// }
// log.debug("shape end -------------------------------", .{});
// }
// Special fonts aren't shaped and their codepoint == glyph so we // Special fonts aren't shaped and their codepoint == glyph so we
// can just return the codepoints as-is. // can just return the codepoints as-is.
if (run.font_index.special() != null) { if (run.font_index.special() != null) {
@ -322,8 +330,13 @@ pub const Shaper = struct {
// Our cluster is also our cell X position. If the cluster changes // Our cluster is also our cell X position. If the cluster changes
// then we need to reset our current cell offsets. // then we need to reset our current cell offsets.
const cluster = state.codepoints.items[index].cluster; const cluster = state.codepoints.items[index].cluster;
if (cell_offset.cluster != cluster) { if (cell_offset.cluster != cluster) pad: {
assert(cell_offset.cluster < cluster); // We previously asserted this but for rtl text this is
// not true. So we check for this and break out. In the
// future we probably need to reverse pad for rtl but
// I don't have a solid test case for this yet so let's
// wait for that.
if (cell_offset.cluster > cluster) break :pad;
// If we have a gap between clusters then we need to // If we have a gap between clusters then we need to
// add empty cells to the buffer. // add empty cells to the buffer.