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

Global: make FFinstance instance a global variable

Browse Source 
As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/title/title.c
+14 -14
View File
@@ -4,32 +4,32 @@
#include "util/textModifier.h"
#include "util/stringUtils.h"
static inline void printTitlePart(FFinstance* instance, const FFstrbuf* content)
static inline void printTitlePart(const FFstrbuf* content)
{
if(!instance->config.pipe)
if(!instance.config.pipe)
{
fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
ffPrintColor(&instance->config.colorTitle);
ffPrintColor(&instance.config.colorTitle);
}
ffStrbufWriteTo(content, stdout);
if(!instance->config.pipe)
if(!instance.config.pipe)
fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
}
void ffPrintTitle(FFinstance* instance, FFTitleOptions* options)
void ffPrintTitle(FFTitleOptions* options)
{
ffLogoPrintLine(instance);
ffLogoPrintLine();
printTitlePart(instance, &instance->state.platform.userName);
printTitlePart(&instance.state.platform.userName);
putchar('@');
FFstrbuf* host = options->fdqn ?
&instance->state.platform.domainName :
&instance->state.platform.hostName;
printTitlePart(instance, host);
&instance.state.platform.domainName :
&instance.state.platform.hostName;
printTitlePart(host);
instance->state.titleLength = instance->state.platform.userName.length + host->length + 1;
instance.state.titleLength = instance.state.platform.userName.length + host->length + 1;
putchar('\n');
}
@@ -59,7 +59,7 @@ void ffDestroyTitleOptions(FFTitleOptions* options)
FF_UNUSED(options);
}
void ffParseTitleJsonObject(FFinstance* instance, yyjson_val* module)
void ffParseTitleJsonObject(yyjson_val* module)
{
FFTitleOptions __attribute__((__cleanup__(ffDestroyTitleOptions))) options;
ffInitTitleOptions(&options);
@@ -80,9 +80,9 @@ void ffParseTitleJsonObject(FFinstance* instance, yyjson_val* module)
continue;
}
ffPrintErrorString(instance, FF_TITLE_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
}
}
ffPrintTitle(instance, &options);
ffPrintTitle(&options);
}
src/modules/title/title.h
+2 -2
View File
@@ -4,8 +4,8 @@
#define FF_TITLE_MODULE_NAME "Title"
void ffPrintTitle(FFinstance* instance, FFTitleOptions* options);
void ffPrintTitle(FFTitleOptions* options);
void ffInitTitleOptions(FFTitleOptions* options);
bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value);
void ffDestroyTitleOptions(FFTitleOptions* options);
void ffParseTitleJsonObject(FFinstance* instance, yyjson_val* module);
void ffParseTitleJsonObject(yyjson_val* module);