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

Title: add option --title-color-user, --title-color-at and --title-color-host

Browse Source
This commit is contained in:
李通洲
2023-07-20 11:21:12 +08:00
parent 00a5f1bf3f
commit e9ec7d3597
6 changed files with 89 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/title/option.h
+3
View File
@@ -10,4 +10,7 @@ typedef struct FFTitleOptions
FFModuleArgs moduleArgs;
bool fqdn;
FFstrbuf colorUser;
FFstrbuf colorAt;
FFstrbuf colorHost;
} FFTitleOptions;
src/modules/title/title.c
+50 -4
View File
@@ -6,12 +6,12 @@
#define FF_TITLE_NUM_FORMAT_ARGS 2
static inline void printTitlePart(const FFstrbuf* content)
static inline void printTitlePart(const FFstrbuf* content, const FFstrbuf* color)
{
if(!instance.config.pipe)
{
fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
ffPrintColor(&instance.config.colorTitle);
ffPrintColor(color->length > 0 ? color : &instance.config.colorTitle);
}
ffStrbufWriteTo(content, stdout);
@@ -29,9 +29,14 @@ void ffPrintTitle(FFTitleOptions* options)
if (options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(options->moduleArgs.key.length == 0 ? NULL : FF_TITLE_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
printTitlePart(&instance.state.platform.userName);
printTitlePart(&instance.state.platform.userName, &options->colorUser);
if (!instance.config.pipe && options->colorAt.length > 0)
ffPrintColor(&options->colorAt);
putchar('@');
printTitlePart(host);
printTitlePart(host, &options->colorHost);
putchar('\n');
}
else
@@ -49,6 +54,9 @@ void ffInitTitleOptions(FFTitleOptions* options)
options->moduleName = FF_TITLE_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
options->fqdn = false;
ffStrbufInit(&options->colorUser);
ffStrbufInit(&options->colorAt);
ffStrbufInit(&options->colorHost);
}
bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value)
@@ -64,12 +72,33 @@ bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const
return true;
}
if (ffStrEqualsIgnCase(subKey, "color-user"))
{
ffOptionParseColor(value, &options->colorUser);
return true;
}
if (ffStrEqualsIgnCase(subKey, "color-at"))
{
ffOptionParseColor(value, &options->colorAt);
return true;
}
if (ffStrEqualsIgnCase(subKey, "color-host"))
{
ffOptionParseColor(value, &options->colorHost);
return true;
}
return false;
}
void ffDestroyTitleOptions(FFTitleOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
ffStrbufDestroy(&options->colorUser);
ffStrbufDestroy(&options->colorAt);
ffStrbufDestroy(&options->colorHost);
}
void ffParseTitleJsonObject(yyjson_val* module)
@@ -96,6 +125,23 @@ void ffParseTitleJsonObject(yyjson_val* module)
continue;
}
if (ffStrEqualsIgnCase(key, "color"))
{
if (!yyjson_is_obj(val))
continue;
yyjson_val* color = yyjson_obj_get(val, "user");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options.colorUser);
color = yyjson_obj_get(val, "at");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options.colorAt);
color = yyjson_obj_get(val, "host");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options.colorHost);
continue;
}
ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
}
}