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

Merge pull request #1673 from mitchellh/font-mem

Browse Source 
font: SharedGridSet.Key needs to clone the DerivedConfig
This commit is contained in:
Mitchell Hashimoto
2024-04-11 17:38:22 -04:00
committed by GitHub
parent c5496b89ee 13d9c0159d
commit 260f617f92
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/font/SharedGridSet.zig
View File

@ -367,7 +367,9 @@ pub const DerivedConfig = struct {
@"adjust-strikethrough-position": ?Metrics.Modifier,
@"adjust-strikethrough-thickness": ?Metrics.Modifier,
pub fn init(alloc_gpa: Allocator, config: *const Config) !DerivedConfig {
/// Initialize a DerivedConfig. The config should be either a
/// config.Config or another DerivedConfig to clone from.
pub fn init(alloc_gpa: Allocator, config: anytype) !DerivedConfig {
var arena = ArenaAllocator.init(alloc_gpa);
errdefer arena.deinit();
const alloc = arena.allocator();
@ -447,13 +449,20 @@ pub const Key = struct {
pub fn init(
alloc_gpa: Allocator,
config: *const DerivedConfig,
config_src: *const DerivedConfig,
font_size: DesiredSize,
) !Key {
var arena = ArenaAllocator.init(alloc_gpa);
errdefer arena.deinit();
const alloc = arena.allocator();
// Clone our configuration. We need to do this because the lifetime
// of the derived config is usually shorter than that of a key
// and we use pointers into the derived config for the key. We
// can remove this if we wanted by dupe-ing the memory we use
// from DerivedConfig below.
var config = try DerivedConfig.init(alloc, config_src);
var descriptors = std.ArrayList(discovery.Descriptor).init(alloc);
defer descriptors.deinit();
for (config.@"font-family".list.items) |family| {