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

font/sprite: fix z2d StaticPath accounting + undefined use

Browse Source 
Annotate the node count of all uses of z2d `StaticPath` to verify
correctness, adjusted the size of a couple which were oversized, and
changed all painter calls that take node slices from `StaticPath`s to
use the slice from the wrapped `ArrayList` so that we don't include any
potentially `undefined` nodes at the end of the list, which I think was
causing a crash before.
This commit is contained in:
Qwerasd
2024-12-23 04:21:33 -05:00
parent 98651ab0e5
commit 9f4d9dc36e
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/font/sprite/Box.zig
View File

@ -2515,19 +2515,19 @@ fn draw_smooth_mosaic(
const right: f64 = @floatFromInt(self.metrics.cell_width); const right: f64 = @floatFromInt(self.metrics.cell_width);
var path: z2d.StaticPath(12) = .{}; var path: z2d.StaticPath(12) = .{};
path.init(); path.init(); // nodes.len = 0
if (mosaic.tl) path.lineTo(left, top); if (mosaic.tl) path.lineTo(left, top); // +1, nodes.len = 1
if (mosaic.ul) path.lineTo(left, upper); if (mosaic.ul) path.lineTo(left, upper); // +1, nodes.len = 2
if (mosaic.ll) path.lineTo(left, lower); if (mosaic.ll) path.lineTo(left, lower); // +1, nodes.len = 3
if (mosaic.bl) path.lineTo(left, bottom); if (mosaic.bl) path.lineTo(left, bottom); // +1, nodes.len = 4
if (mosaic.bc) path.lineTo(center, bottom); if (mosaic.bc) path.lineTo(center, bottom); // +1, nodes.len = 5
if (mosaic.br) path.lineTo(right, bottom); if (mosaic.br) path.lineTo(right, bottom); // +1, nodes.len = 6
if (mosaic.lr) path.lineTo(right, lower); if (mosaic.lr) path.lineTo(right, lower); // +1, nodes.len = 7
if (mosaic.ur) path.lineTo(right, upper); if (mosaic.ur) path.lineTo(right, upper); // +1, nodes.len = 8
if (mosaic.tr) path.lineTo(right, top); if (mosaic.tr) path.lineTo(right, top); // +1, nodes.len = 9
if (mosaic.tc) path.lineTo(center, top); if (mosaic.tc) path.lineTo(center, top); // +1, nodes.len = 10
path.close(); path.close(); // +2, nodes.len = 12
try z2d.painter.fill( try z2d.painter.fill(
canvas.alloc, canvas.alloc,
@ -2535,7 +2535,7 @@ fn draw_smooth_mosaic(
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(Shade.on) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(Shade.on) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{}, .{},
); );
} }
@ -2560,12 +2560,12 @@ fn draw_edge_triangle(
}; };
var path: z2d.StaticPath(5) = .{}; var path: z2d.StaticPath(5) = .{};
path.init(); path.init(); // nodes.len = 0
path.moveTo(center, middle); path.moveTo(center, middle); // +1, nodes.len = 1
path.lineTo(x0, y0); path.lineTo(x0, y0); // +1, nodes.len = 2
path.lineTo(x1, y1); path.lineTo(x1, y1); // +1, nodes.len = 3
path.close(); path.close(); // +2, nodes.len = 5
try z2d.painter.fill( try z2d.painter.fill(
canvas.alloc, canvas.alloc,
@ -2573,7 +2573,7 @@ fn draw_edge_triangle(
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(Shade.on) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(Shade.on) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{}, .{},
); );
} }

48
src/font/sprite/canvas.zig
View File

@ -184,13 +184,13 @@ pub const Canvas = struct {
/// Draw and fill a quad. /// Draw and fill a quad.
pub fn quad(self: *Canvas, q: Quad(f64), color: Color) !void { pub fn quad(self: *Canvas, q: Quad(f64), color: Color) !void {
var path: z2d.StaticPath(6) = .{}; var path: z2d.StaticPath(6) = .{};
path.init(); path.init(); // nodes.len = 0
path.moveTo(q.p0.x, q.p0.y); path.moveTo(q.p0.x, q.p0.y); // +1, nodes.len = 1
path.lineTo(q.p1.x, q.p1.y); path.lineTo(q.p1.x, q.p1.y); // +1, nodes.len = 2
path.lineTo(q.p2.x, q.p2.y); path.lineTo(q.p2.x, q.p2.y); // +1, nodes.len = 3
path.lineTo(q.p3.x, q.p3.y); path.lineTo(q.p3.x, q.p3.y); // +1, nodes.len = 4
path.close(); path.close(); // +2, nodes.len = 6
try z2d.painter.fill( try z2d.painter.fill(
self.alloc, self.alloc,
@ -198,7 +198,7 @@ pub const Canvas = struct {
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{}, .{},
); );
} }
@ -206,12 +206,12 @@ pub const Canvas = struct {
/// Draw and fill a triangle. /// Draw and fill a triangle.
pub fn triangle(self: *Canvas, t: Triangle(f64), color: Color) !void { pub fn triangle(self: *Canvas, t: Triangle(f64), color: Color) !void {
var path: z2d.StaticPath(5) = .{}; var path: z2d.StaticPath(5) = .{};
path.init(); path.init(); // nodes.len = 0
path.moveTo(t.p0.x, t.p0.y); path.moveTo(t.p0.x, t.p0.y); // +1, nodes.len = 1
path.lineTo(t.p1.x, t.p1.y); path.lineTo(t.p1.x, t.p1.y); // +1, nodes.len = 2
path.lineTo(t.p2.x, t.p2.y); path.lineTo(t.p2.x, t.p2.y); // +1, nodes.len = 3
path.close(); path.close(); // +2, nodes.len = 5
try z2d.painter.fill( try z2d.painter.fill(
self.alloc, self.alloc,
@ -219,18 +219,18 @@ pub const Canvas = struct {
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{}, .{},
); );
} }
pub fn triangle_outline(self: *Canvas, t: Triangle(f64), thickness: f64, color: Color) !void { pub fn triangle_outline(self: *Canvas, t: Triangle(f64), thickness: f64, color: Color) !void {
var path: z2d.StaticPath(5) = .{}; var path: z2d.StaticPath(3) = .{};
path.init(); path.init(); // nodes.len = 0
path.moveTo(t.p0.x, t.p0.y); path.moveTo(t.p0.x, t.p0.y); // +1, nodes.len = 1
path.lineTo(t.p1.x, t.p1.y); path.lineTo(t.p1.x, t.p1.y); // +1, nodes.len = 2
path.lineTo(t.p2.x, t.p2.y); path.lineTo(t.p2.x, t.p2.y); // +1, nodes.len = 3
try z2d.painter.stroke( try z2d.painter.stroke(
self.alloc, self.alloc,
@ -238,7 +238,7 @@ pub const Canvas = struct {
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{ .{
.line_cap_mode = .round, .line_cap_mode = .round,
.line_width = thickness, .line_width = thickness,
@ -248,11 +248,11 @@ pub const Canvas = struct {
/// Stroke a line. /// Stroke a line.
pub fn line(self: *Canvas, l: Line(f64), thickness: f64, color: Color) !void { pub fn line(self: *Canvas, l: Line(f64), thickness: f64, color: Color) !void {
var path: z2d.StaticPath(3) = .{}; var path: z2d.StaticPath(2) = .{};
path.init(); path.init(); // nodes.len = 0
path.moveTo(l.p0.x, l.p0.y); path.moveTo(l.p0.x, l.p0.y); // +1, nodes.len = 1
path.lineTo(l.p1.x, l.p1.y); path.lineTo(l.p1.x, l.p1.y); // +1, nodes.len = 2
try z2d.painter.stroke( try z2d.painter.stroke(
self.alloc, self.alloc,
@ -260,7 +260,7 @@ pub const Canvas = struct {
&.{ .opaque_pattern = .{ &.{ .opaque_pattern = .{
.pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } }, .pixel = .{ .alpha8 = .{ .a = @intFromEnum(color) } },
} }, } },
&path.nodes, path.wrapped_path.nodes.items,
.{ .{
.line_cap_mode = .round, .line_cap_mode = .round,
.line_width = thickness, .line_width = thickness,