mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-30 19:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

address review: Discover.init takes a Library across all backends

Browse Source 
Per review feedback, drop the `if (Discover == Windows)` comptime
branches in SharedGridSet and list_fonts by making every backend's
`init` take a Library and ignore it when unused. Call sites just do
`Discover.init(self.font_lib)` now.

Also adds a discovery test for the Windows backend that looks up
Arial and checks the returned face has the 'A' codepoint.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yasuhiro Matsumoto
2026-04-23 23:06:21 +09:00
parent fe2a909782
commit 5aef2541b0
3 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/font/SharedGridSet.zig
View File

@@ -442,10 +442,7 @@ fn discover(self: *SharedGridSet) !?*Discover {
// If we initialized, use it
if (self.font_discover) |*v| return v;
self.font_discover = if (comptime Discover == discovery.Windows)
.init(self.font_lib)
else
.init();
self.font_discover = .init(self.font_lib);
return &self.font_discover.?;
}

52
src/font/discovery.zig
View File

@@ -247,7 +247,8 @@ pub const Descriptor = struct {
pub const Fontconfig = struct {
fc_config: *fontconfig.Config,
pub fn init() Fontconfig {
pub fn init(lib: Library) Fontconfig {
_ = lib;
// safe to call multiple times and concurrently
_ = fontconfig.init();
return .{ .fc_config = fontconfig.initLoadConfigAndFonts() };
@@ -338,7 +339,8 @@ pub const Fontconfig = struct {
};
pub const CoreText = struct {
pub fn init() CoreText {
pub fn init(lib: Library) CoreText {
_ = lib;
// Required for the "interface" but does nothing for CoreText.
return .{};
}
@@ -1162,7 +1164,10 @@ test "fontconfig" {
const testing = std.testing;
const alloc = testing.allocator;
var fc = Fontconfig.init();
var lib = try Library.init(alloc);
defer lib.deinit();
var fc = Fontconfig.init(lib);
defer fc.deinit();
var it = try fc.discover(alloc, .{ .family = "monospace", .size = 12 });
defer it.deinit();
@@ -1174,7 +1179,10 @@ test "fontconfig codepoint" {
const testing = std.testing;
const alloc = testing.allocator;
var fc = Fontconfig.init();
var lib = try Library.init(alloc);
defer lib.deinit();
var fc = Fontconfig.init(lib);
defer fc.deinit();
var it = try fc.discover(alloc, .{ .codepoint = 'A', .size = 12 });
defer it.deinit();
@@ -1196,7 +1204,10 @@ test "coretext" {
const testing = std.testing;
const alloc = testing.allocator;
var ct = CoreText.init();
var lib = try Library.init(alloc);
defer lib.deinit();
var ct = CoreText.init(lib);
defer ct.deinit();
var it = try ct.discover(alloc, .{ .family = "Monaco", .size = 12 });
defer it.deinit();
@@ -1214,7 +1225,10 @@ test "coretext codepoint" {
const testing = std.testing;
const alloc = testing.allocator;
var ct = CoreText.init();
var lib = try Library.init(alloc);
defer lib.deinit();
var ct = CoreText.init(lib);
defer ct.deinit();
var it = try ct.discover(alloc, .{ .codepoint = 'A', .size = 12 });
defer it.deinit();
@@ -1243,7 +1257,10 @@ test "coretext sorting" {
const testing = std.testing;
const alloc = testing.allocator;
var ct = CoreText.init();
var lib = try Library.init(alloc);
defer lib.deinit();
var ct = CoreText.init(lib);
defer ct.deinit();
// We try to get a Regular, Italic, Bold, & Bold Italic version of SF Pro,
@@ -1309,3 +1326,24 @@ test "coretext sorting" {
try testing.expectEqualStrings("SF Pro Bold Italic", name);
}
}
test "windows" {
if (options.backend != .freetype_windows) return error.SkipZigTest;
const testing = std.testing;
const alloc = testing.allocator;
var lib = try Library.init(alloc);
defer lib.deinit();
var win = Windows.init(lib);
defer win.deinit();
// Arial ships on every stock Windows install.
var it = try win.discover(alloc, .{ .family = "Arial", .size = 12 });
defer it.deinit();
var face = (try it.next()) orelse return error.TestFontNotFound;
defer face.deinit();
try testing.expect(face.hasCodepoint('A', null));
}