font: Add FreeType cleanups

Release the font face when the font is no longer used and deinitialize the FT library on shutdown. Signed-off-by: Alexander Shishkin <[email protected]>
virtuoso · Oct 5, 2024 · 8b22263 · 8b22263
1 parent 978b38d
commit 8b22263
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/core/clap.c b/core/clap.c
@@ -157,6 +157,8 @@ void clap_done(struct clap_context *ctx, int status)
         phys_done();
     if (ctx->cfg.graphics)
         gl_done();
+    if (ctx->cfg.font)
+        font_done();
     messagebus_done();
     exit_cleanup_run(status);
 }
diff --git a/core/font.c b/core/font.c
@@ -77,6 +77,7 @@ static void font_drop(struct ref *ref)
     for (i = 0; i < array_size(font->g); i++)
         texture_deinit(&font->g[i].tex);
     free(font->name);
+    FT_Done_Face(font->face);
 }
 
 DECLARE_REFCLASS(font);
@@ -153,3 +154,10 @@ int font_init(void)
     dbg("freetype initialized\n");
     return 0;
 }
+
+void font_done(void)
+{
+    if (default_font)
+        font_put(default_font);
+    FT_Done_FreeType(ft);
+}
diff --git a/core/font.h b/core/font.h
@@ -18,6 +18,7 @@ struct glyph {
 
 struct font;
 int font_init(void);
+void font_done(void);
 const char *font_name(struct font *font);
 struct font *font_open(const char *name, unsigned int size);
 void         font_put(struct font *font);