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

Merge pull request #1842 from ghostty-org/font-crash

Browse Source 
font: preload deferred faces in SharedGrid to avoid data races
This commit is contained in:
Mitchell Hashimoto
2024-06-07 20:35:14 -07:00
committed by GitHub
parent 0d94fb61c9 919b00571a
commit 6bd8cfb840
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/font/SharedGrid.zig
View File

@ -142,6 +142,11 @@ pub fn cellSize(self: *SharedGrid) renderer.CellSize {
} }
/// Get the font index for a given codepoint. This is cached. /// Get the font index for a given codepoint. This is cached.
///
/// This always forces loading any deferred fonts since we assume that if
/// you're looking up an index that the caller plans to use the font. By
/// loading the font in this function we can ensure thread-safety on the
/// load without complicating future calls.
pub fn getIndex( pub fn getIndex(
self: *SharedGrid, self: *SharedGrid,
alloc: Allocator, alloc: Allocator,
@ -171,6 +176,18 @@ pub fn getIndex(
// Load a value and cache it. This even caches negative matches. // Load a value and cache it. This even caches negative matches.
const value = self.resolver.getIndex(alloc, cp, style, p); const value = self.resolver.getIndex(alloc, cp, style, p);
gop.value_ptr.* = value; gop.value_ptr.* = value;
if (value) |idx| preload: {
// If the font is a sprite font then we don't need to preload
// because getFace doesn't work with special fonts.
if (idx.special() != null) break :preload;
// Load the face in case its deferred. If this fails then we would've
// failed to load it in the future anyways so we want to undo all
// the caching we did.
_ = try self.resolver.collection.getFace(idx);
}
return value; return value;
} }