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

font/coretext: face doesn't need harfbuzz font if we're not using it

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-04-04 12:18:28 -07:00
parent c5bbbdb5ee
commit e41e45e1ad
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/font/face/coretext.zig
View File

@ -13,8 +13,9 @@ pub const Face = struct {
/// Our font face /// Our font face
font: *macos.text.Font, font: *macos.text.Font,
/// Harfbuzz font corresponding to this face. /// Harfbuzz font corresponding to this face. We only use this
hb_font: harfbuzz.Font, /// if we're using Harfbuzz.
hb_font: if (harfbuzz_shaper) harfbuzz.Font else void,
/// The presentation for this font. /// The presentation for this font.
presentation: font.Presentation, presentation: font.Presentation,
@ -25,6 +26,10 @@ pub const Face = struct {
/// Set quirks.disableDefaultFontFeatures /// Set quirks.disableDefaultFontFeatures
quirks_disable_default_font_features: bool = false, quirks_disable_default_font_features: bool = false,
/// True if our build is using Harfbuzz. If we're not, we can avoid
/// some Harfbuzz-specific code paths.
const harfbuzz_shaper = font.Shaper == font.shape.harfbuzz.Shaper;
/// The matrix applied to a regular font to auto-italicize it. /// The matrix applied to a regular font to auto-italicize it.
pub const italic_skew = macos.graphics.AffineTransform{ pub const italic_skew = macos.graphics.AffineTransform{
.a = 1, .a = 1,
@ -75,10 +80,6 @@ pub const Face = struct {
/// Initialize a face with a CTFont. This will take ownership over /// Initialize a face with a CTFont. This will take ownership over
/// the CTFont. This does NOT copy or retain the CTFont. /// the CTFont. This does NOT copy or retain the CTFont.
pub fn initFont(ct_font: *macos.text.Font, opts: font.face.Options) !Face { pub fn initFont(ct_font: *macos.text.Font, opts: font.face.Options) !Face {
var hb_font = try harfbuzz.coretext.createFont(ct_font);
errdefer hb_font.destroy();
hb_font.setScale(opts.size.pixels(), opts.size.pixels());
const traits = ct_font.getSymbolicTraits(); const traits = ct_font.getSymbolicTraits();
const metrics = metrics: { const metrics = metrics: {
var metrics = try calcMetrics(ct_font); var metrics = try calcMetrics(ct_font);
@ -86,6 +87,13 @@ pub const Face = struct {
break :metrics metrics; break :metrics metrics;
}; };
var hb_font = if (comptime harfbuzz_shaper) font: {
var hb_font = try harfbuzz.coretext.createFont(ct_font);
hb_font.setScale(opts.size.pixels(), opts.size.pixels());
break :font hb_font;
} else {};
errdefer if (comptime harfbuzz_shaper) hb_font.destroy();
var result: Face = .{ var result: Face = .{
.font = ct_font, .font = ct_font,
.hb_font = hb_font, .hb_font = hb_font,
@ -144,7 +152,7 @@ pub const Face = struct {
pub fn deinit(self: *Face) void { pub fn deinit(self: *Face) void {
self.font.release(); self.font.release();
self.hb_font.destroy(); if (comptime harfbuzz_shaper) self.hb_font.destroy();
self.* = undefined; self.* = undefined;
} }

4
src/font/shape.zig
View File

@ -1,7 +1,7 @@
const builtin = @import("builtin"); const builtin = @import("builtin");
const options = @import("main.zig").options; const options = @import("main.zig").options;
const harfbuzz = @import("shaper/harfbuzz.zig"); pub const harfbuzz = @import("shaper/harfbuzz.zig");
const coretext = @import("shaper/coretext.zig"); pub const coretext = @import("shaper/coretext.zig");
pub const web_canvas = @import("shaper/web_canvas.zig"); pub const web_canvas = @import("shaper/web_canvas.zig");
pub usingnamespace @import("shaper/run.zig"); pub usingnamespace @import("shaper/run.zig");

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

@ -1,7 +1,6 @@
const std = @import("std"); const std = @import("std");
const assert = std.debug.assert; const assert = std.debug.assert;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const harfbuzz = @import("harfbuzz");
const macos = @import("macos"); const macos = @import("macos");
const trace = @import("tracy").trace; const trace = @import("tracy").trace;
const font = @import("../main.zig"); const font = @import("../main.zig");