Colors: support JSON config

This commit is contained in:
李通洲
2023-03-15 17:02:54 +08:00
parent ff721218f5
commit 9209ac5773
6 changed files with 24 additions and 2 deletions
+1 -1
View File
@@ -269,7 +269,7 @@ set(LIBFASTFETCH_SRC
src/modules/brightness/brightness.c
src/modules/break/break.c
src/modules/chassis.c
src/modules/colors.c
src/modules/colors/colors.c
src/modules/cpu.c
src/modules/cpuUsage.c
src/modules/cursor.c
+1 -1
View File
@@ -1331,7 +1331,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
ffPrintMedia(instance);
else if(strcasecmp(line, FF_DATETIME_MODULE_NAME) == 0)
ffPrintDateTime(instance, &instance->config.dateTime);
else if(strcasecmp(line, "colors") == 0)
else if(strcasecmp(line, FF_COLORS_MODULE_NAME) == 0)
ffPrintColors(instance);
else if(strcasecmp(line, "vulkan") == 0)
ffPrintVulkan(instance);
@@ -1,6 +1,7 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "util/textModifier.h"
#include "modules/colors/colors.h"
void ffPrintColors(FFinstance* instance)
{
@@ -28,3 +29,10 @@ void ffPrintColors(FFinstance* instance)
puts(FASTFETCH_TEXT_MODIFIER_RESET);
}
#ifdef FF_HAVE_JSONC
void ffParseColorsJsonObject(FFinstance* instance, FF_MAYBE_UNUSED json_object* module)
{
return ffPrintColors(instance);
}
#endif
+12
View File
@@ -0,0 +1,12 @@
#pragma once
#include "fastfetch.h"
#define FF_COLORS_MODULE_NAME "Colors"
void ffPrintColors(FFinstance* instance);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParseColorsJsonObject(FFinstance* instance, json_object* module);
#endif
+1
View File
@@ -40,6 +40,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
case 'C': {
return
tryModule(instance, type, module, FF_COMMAND_MODULE_NAME, ffParseCommandJsonObject) ||
tryModule(instance, type, module, FF_COLORS_MODULE_NAME, ffParseColorsJsonObject) ||
false;
}
+1
View File
@@ -10,6 +10,7 @@
#include "modules/board/board.h"
#include "modules/break/break.h"
#include "modules/command/command.h"
#include "modules/colors/colors.h"
#include "modules/datetime/datetime.h"
#include "modules/display/display.h"
#include "modules/host/host.h"