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

font: faceFromIndex returns a pointer to the face

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-12-12 21:33:02 -08:00
parent c06ca04a1a
commit a1dda2c37f
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/font/Group.zig
View File

@ -245,11 +245,11 @@ pub fn presentationFromIndex(self: Group, index: FontIndex) !font.Presentation {
/// Return the Face represented by a given FontIndex. Note that special /// Return the Face represented by a given FontIndex. Note that special
/// fonts (i.e. box glyphs) do not have a face. /// fonts (i.e. box glyphs) do not have a face.
pub fn faceFromIndex(self: Group, index: FontIndex) !Face { pub fn faceFromIndex(self: Group, index: FontIndex) !*Face {
if (index.special() != null) return error.SpecialHasNoFace; if (index.special() != null) return error.SpecialHasNoFace;
const deferred = &self.faces.get(index.style).items[@intCast(usize, index.idx)]; const deferred = &self.faces.get(index.style).items[@intCast(usize, index.idx)];
try deferred.load(self.lib, self.size); try deferred.load(self.lib, self.size);
return deferred.face.?; return &deferred.face.?;
} }
/// Render a glyph by glyph index into the given font atlas and return /// Render a glyph by glyph index into the given font atlas and return
@ -556,3 +556,27 @@ test "discover monospace with fontconfig and freetype" {
); );
} }
} }
test "faceFromIndex returns pointer" {
const testing = std.testing;
const alloc = testing.allocator;
const testFont = @import("test.zig").fontRegular;
var atlas_greyscale = try font.Atlas.init(alloc, 512, .greyscale);
defer atlas_greyscale.deinit(alloc);
var lib = try Library.init();
defer lib.deinit();
var group = try init(alloc, lib, .{ .points = 12, .xdpi = 96, .ydpi = 96 });
defer group.deinit();
try group.addFace(alloc, .regular, DeferredFace.initLoaded(try Face.init(lib, testFont, .{ .points = 12, .xdpi = 96, .ydpi = 96 })));
{
const idx = group.indexForCodepoint('A', .regular, null).?;
const face1 = try group.faceFromIndex(idx);
const face2 = try group.faceFromIndex(idx);
try testing.expectEqual(@ptrToInt(face1), @ptrToInt(face2));
}
}