TerminalFont: always init terminalFont.font

This commit is contained in:
李通洲
2023-06-13 10:57:52 +08:00
parent ba4c18f80b
commit 17b6ff1a6d
3 changed files with 10 additions and 7 deletions
+8 -7
View File
@@ -3,12 +3,13 @@
#include <string.h>
static void fontInit(FFfont* font)
void ffFontInit(FFfont* font)
{
// Ensure no memory allocates
ffStrbufInit(&font->pretty);
ffStrbufInit(&font->name);
ffStrbufInitA(&font->size, 8);
ffListInitA(&font->styles, sizeof(FFstrbuf), 4);
ffStrbufInit(&font->size);
ffListInit(&font->styles, sizeof(FFstrbuf));
}
static void fontInitPretty(FFfont* font)
@@ -44,7 +45,7 @@ static void fontInitPretty(FFfont* font)
void ffFontInitQt(FFfont* font, const char* data)
{
fontInit(font);
ffFontInit(font);
//See https://doc.qt.io/qt-5/qfont.html#toString
@@ -181,7 +182,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
void ffFontInitPango(FFfont* font, const char* data)
{
fontInit(font);
ffFontInit(font);
while(*data != '\0' && *data != '`' && *data != '\\')
fontPangoParseWord(&data, font, NULL);
@@ -191,7 +192,7 @@ void ffFontInitPango(FFfont* font, const char* data)
void ffFontInitValues(FFfont* font, const char* name, const char* size)
{
fontInit(font);
ffFontInit(font);
ffStrbufAppendS(&font->name, name);
ffStrbufAppendS(&font->size, size);
@@ -213,7 +214,7 @@ void ffFontInitWithSpace(FFfont* font, const char* rawName)
return;
}
fontInit(font);
ffFontInit(font);
ffStrbufAppendNS(&font->name, (uint32_t)(pspace - rawName), rawName);
ffStrbufAppendS(&font->size, pspace + 1);
+1
View File
@@ -14,6 +14,7 @@ typedef struct FFfont
FFlist styles;
} FFfont;
void ffFontInit(FFfont* font);
void ffFontInitQt(FFfont* font, const char* data);
void ffFontInitPango(FFfont* font, const char* data);
void ffFontInitCopy(FFfont* font, const char* name);
+1
View File
@@ -9,6 +9,7 @@
void ffPrintTerminalFont(FFinstance* instance, FFTerminalFontOptions* options)
{
FFTerminalFontResult terminalFont;
ffFontInit(&terminalFont.font);
ffStrbufInit(&terminalFont.error);
if(!ffDetectTerminalFont(instance, &terminalFont))