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

Display: add option --color-separator

Browse Source
This commit is contained in:
Carter Li
2024-05-28 16:13:06 +08:00
parent 745865d66a
commit 983e5c680f
6 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options/display.c
+14
View File
@@ -51,6 +51,9 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
const char* colorOutput = yyjson_get_str(yyjson_obj_get(val, "output"));
if (colorOutput)
ffOptionParseColor(colorOutput, &options->colorOutput);
const char* colorSeparator = yyjson_get_str(yyjson_obj_get(val, "separator"));
if (colorSeparator)
ffOptionParseColor(colorSeparator, &options->colorSeparator);
}
else
return "display.color must be either a string or an object";
@@ -252,6 +255,11 @@ bool ffOptionsParseDisplayCommandLine(FFOptionsDisplay* options, const char* key
optionCheckString(key, value, &options->colorOutput);
ffOptionParseColor(value, &options->colorOutput);
}
else if(ffStrEqualsIgnCase(subkey, "separator"))
{
optionCheckString(key, value, &options->colorSeparator);
ffOptionParseColor(value, &options->colorSeparator);
}
else
return false;
}
@@ -355,6 +363,7 @@ void ffOptionsInitDisplay(FFOptionsDisplay* options)
ffStrbufInit(&options->colorKeys);
ffStrbufInit(&options->colorTitle);
ffStrbufInit(&options->colorOutput);
ffStrbufInit(&options->colorSeparator);
options->brightColor = true;
ffStrbufInitStatic(&options->keyValueSeparator, ": ");
@@ -399,6 +408,7 @@ void ffOptionsDestroyDisplay(FFOptionsDisplay* options)
ffStrbufDestroy(&options->colorKeys);
ffStrbufDestroy(&options->colorTitle);
ffStrbufDestroy(&options->colorOutput);
ffStrbufDestroy(&options->colorSeparator);
ffStrbufDestroy(&options->keyValueSeparator);
ffStrbufDestroy(&options->barCharElapsed);
ffStrbufDestroy(&options->barCharTotal);
@@ -435,6 +445,10 @@ void ffOptionsGenerateDisplayJsonConfig(FFOptionsDisplay* options, yyjson_mut_do
yyjson_mut_obj_add_strbuf(doc, color, "keys", &options->colorKeys);
if (!ffStrbufEqual(&options->colorTitle, &defaultOptions.colorTitle))
yyjson_mut_obj_add_strbuf(doc, color, "title", &options->colorTitle);
if (!ffStrbufEqual(&options->colorOutput, &defaultOptions.colorOutput))
yyjson_mut_obj_add_strbuf(doc, color, "output", &options->colorOutput);
if (!ffStrbufEqual(&options->colorSeparator, &defaultOptions.colorSeparator))
yyjson_mut_obj_add_strbuf(doc, color, "separator", &options->colorSeparator);
if (yyjson_mut_obj_size(color) > 0)
{
if (yyjson_mut_obj_size(color) == 2 && ffStrbufEqual(&options->colorKeys, &options->colorTitle))
src/options/display.h
+1
View File
@@ -22,6 +22,7 @@ typedef struct FFOptionsDisplay
FFstrbuf colorKeys;
FFstrbuf colorTitle;
FFstrbuf colorOutput;
FFstrbuf colorSeparator;
bool brightColor;