fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-06 13:14:21 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

better result handling of calculation functions

Browse Source
This commit is contained in:
Linus Dierheimer
2021-04-22 21:41:42 +02:00
parent c12484ec6b
commit e28126f40e
23 changed files with 520 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/terminalfont.c
+5 -5
View File
@@ -68,18 +68,18 @@ static void printTTY(FFinstance* instance)
void ffPrintTerminalFont(FFinstance* instance)
{
ffCalculateTerminal(instance);
const FFTerminalResult* result = ffCalculateTerminal(instance);
if(instance->state.terminal.exeName.length == 0)
if(result->exeName.length == 0)
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Terminal font needs successfull terminal detection");
return;
}
if(ffStrbufIgnCaseCompS(&instance->state.terminal.exeName, "konsole") == 0)
if(ffStrbufIgnCaseCompS(&result->exeName, "konsole") == 0)
printKonsole(instance);
else if(ffStrbufStartsWithIgnCaseS(&instance->state.terminal.exeName, "login"))
else if(ffStrbufStartsWithIgnCaseS(&result->exeName, "login"))
printTTY(instance);
else
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Terminal Font", "Unknown terminal: %s", instance->state.terminal.exeName.chars);
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Terminal Font", "Unknown terminal: %s", result->exeName.chars);
}