fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

TerminalFont: don't use singleton

Browse Source 
Singleton doesn't work well with JSON config
This commit is contained in:
李通洲
2023-06-12 21:18:12 +08:00
parent fc12494ac1
commit cba352cca6
3 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/terminalfont/terminalfont.c
+21 -16
View File
@@ -8,28 +8,33 @@
void ffPrintTerminalFont(FFinstance* instance, FFTerminalFontOptions* options)
{
const FFTerminalFontResult* terminalFont = ffDetectTerminalFont(instance);
FFTerminalFontResult terminalFont;
ffStrbufInit(&terminalFont.error);
if(terminalFont->error.length > 0)
if(!ffDetectTerminalFont(instance, &terminalFont))
{
ffPrintError(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, "%s", terminalFont->error.chars);
return;
}
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs.key);
ffStrbufPutTo(&terminalFont->font.pretty, stdout);
ffPrintError(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, "%s", terminalFont.error.chars);
}
else
{
ffPrintFormat(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_TERMINALFONT_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont->font.pretty},
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont->font.name},
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont->font.size},
{FF_FORMAT_ARG_TYPE_LIST, &terminalFont->font.styles}
});
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs.key);
ffStrbufPutTo(&terminalFont.font.pretty, stdout);
}
else
{
ffPrintFormat(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_TERMINALFONT_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.pretty},
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.name},
{FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.size},
{FF_FORMAT_ARG_TYPE_LIST, &terminalFont.font.styles}
});
}
}
ffStrbufDestroy(&terminalFont.error);
ffFontDestroy(&terminalFont.font);
}
void ffInitTerminalFontOptions(FFTerminalFontOptions* options)