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

Use Apple Emoji font on Mac

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-10-02 11:20:55 -07:00
parent 939e6e7a65
commit c565c561fd
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/macos/text/font_collection.zig
View File

@ -52,6 +52,11 @@ fn debugDumpList(list: *foundation.Array) !void {
defer name.release();
const cstr = name.cstring(&buf, .utf8).?;
var family_buf: [128]u8 = undefined;
const family = desc.copyAttribute(.family_name);
defer family.release();
const family_cstr = family.cstring(&family_buf, .utf8).?;
var buf2: [128]u8 = undefined;
const url = desc.copyAttribute(.url);
defer url.release();
@ -72,7 +77,7 @@ fn debugDumpList(list: *foundation.Array) !void {
"<path cannot be converted to string>";
};
std.log.warn("i={d} name={s} path={s}", .{ i, cstr, path });
std.log.warn("i={d} name={s} family={s} path={s}", .{ i, cstr, family_cstr, path });
}
}
}
@ -112,7 +117,7 @@ test "from descriptors" {
try testing.expect(list.getCount() > 0);
//try debugDumpList(list);
// try debugDumpList(list);
}
test "from descriptors no match" {

15
src/Window.zig
View File

@ -312,6 +312,21 @@ pub fn create(alloc: Allocator, loop: libuv.Loop, config: *const Config) !*Windo
}
}
// If we're on Mac, then we try to use the Apple Emoji font for Emoji.
if (builtin.os.tag == .macos and font.Discover != void) {
var disco = font.Discover.init();
defer disco.deinit();
var disco_it = try disco.discover(.{
.family = "Apple Color Emoji",
.size = font_size.points,
});
defer disco_it.deinit();
if (try disco_it.next()) |face| {
log.debug("font emoji: {s}", .{try face.name()});
try group.addFace(alloc, .regular, face);
}
}
// Our built-in font will be used as a backup
try group.addFace(
alloc,