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

Merge pull request #1721 from mitchellh/coretext

Browse Source 
font: runs do not split on bg color change
This commit is contained in:
Mitchell Hashimoto
2024-04-30 11:29:07 -07:00
committed by GitHub
parent 0b9c78f808 313c7f4cf1
commit 16ba474a28
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/font/shaper/harfbuzz.zig
View File

@ -356,15 +356,9 @@ test "run iterator: empty cells with background set" {
); );
{ {
const run = (try it.next(alloc)).?; const run = (try it.next(alloc)).?;
try testing.expectEqual(@as(u32, 1), shaper.hb_buf.getLength()); try testing.expectEqual(@as(u32, 3), shaper.hb_buf.getLength());
const cells = try shaper.shape(run); const cells = try shaper.shape(run);
try testing.expectEqual(@as(usize, 1), cells.len); try testing.expectEqual(@as(usize, 3), cells.len);
}
{
const run = (try it.next(alloc)).?;
try testing.expectEqual(@as(u32, 2), shaper.hb_buf.getLength());
const cells = try shaper.shape(run);
try testing.expectEqual(@as(usize, 2), cells.len);
} }
try testing.expect(try it.next(alloc) == null); try testing.expect(try it.next(alloc) == null);
} }
@ -1124,7 +1118,7 @@ test "shape cell attribute change" {
try testing.expectEqual(@as(usize, 2), count); try testing.expectEqual(@as(usize, 2), count);
} }
// Changing bg color should split // Changing bg color should not split
{ {
var screen = try terminal.Screen.init(alloc, 3, 10, 0); var screen = try terminal.Screen.init(alloc, 3, 10, 0);
defer screen.deinit(); defer screen.deinit();
@ -1146,7 +1140,7 @@ test "shape cell attribute change" {
count += 1; count += 1;
_ = try shaper.shape(run); _ = try shaper.shape(run);
} }
try testing.expectEqual(@as(usize, 2), count); try testing.expectEqual(@as(usize, 1), count);
} }
// Same bg color should not split // Same bg color should not split

25
src/font/shaper/run.zig
View File

@ -88,9 +88,17 @@ pub const RunIterator = struct {
// If our cell attributes are changing, then we split the run. // If our cell attributes are changing, then we split the run.
// This prevents a single glyph for ">=" to be rendered with // This prevents a single glyph for ">=" to be rendered with
// one color when the two components have different styling. // one color when the two components have different styling.
if (j > self.i) { if (j > self.i) style: {
const prev_cell = cells[j - 1]; const prev_cell = cells[j - 1];
if (prev_cell.style_id != cell.style_id) break;
// If the style is exactly the change then fast path out.
if (prev_cell.style_id == cell.style_id) break :style;
// The style is different. We allow differing background
// styles but any other change results in a new run.
const c1 = comparableStyle(style);
const c2 = comparableStyle(self.row.style(&cells[j]));
if (!c1.eql(c2)) break;
} }
// Text runs break when font styles change so we need to get // Text runs break when font styles change so we need to get
@ -301,3 +309,16 @@ pub const RunIterator = struct {
return null; return null;
} }
}; };
/// Returns a style that when compared must be identical for a run to
/// continue.
fn comparableStyle(style: terminal.Style) terminal.Style {
var s = style;
// We allow background colors to differ because we'll just paint the
// cell background whatever the style is, and wherever the glyph
// lands on top of it will be the color of the glyph.
s.bg_color = .none;
return s;
}