From 36a2fee9d5da84cef3fe9ad67bccc940b7e56116 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sun, 18 Jun 2023 12:32:47 +0800 Subject: [PATCH] Global: support `--*-key-color` --- CHANGELOG.md | 1 + src/common/jsonconfig.c | 5 ++ src/common/option.c | 12 ++++ src/common/option.h | 1 + src/common/printing.c | 23 ++++--- src/common/printing.h | 6 +- src/data/json_schema.jsonc | 88 ++++++++++++++++++------- src/modules/battery/battery.c | 2 +- src/modules/bios/bios.c | 2 +- src/modules/bluetooth/bluetooth.c | 2 +- src/modules/board/board.c | 2 +- src/modules/brightness/brightness.c | 4 +- src/modules/chassis/chassis.c | 2 +- src/modules/command/command.c | 2 +- src/modules/cpu/cpu.c | 2 +- src/modules/cpuusage/cpuusage.c | 2 +- src/modules/cursor/cursor.c | 2 +- src/modules/custom/custom.c | 2 +- src/modules/datetime/datetime.c | 2 +- src/modules/de/de.c | 2 +- src/modules/disk/disk.c | 4 +- src/modules/display/display.c | 6 +- src/modules/font/font.c | 2 +- src/modules/gamepad/gamepad.c | 2 +- src/modules/gpu/gpu.c | 2 +- src/modules/host/host.c | 2 +- src/modules/icons/icons.c | 2 +- src/modules/kernel/kernel.c | 2 +- src/modules/locale/locale.c | 2 +- src/modules/localip/localip.c | 6 +- src/modules/media/media.c | 2 +- src/modules/memory/memory.c | 2 +- src/modules/opencl/opencl.c | 2 +- src/modules/opengl/opengl.c | 2 +- src/modules/os/os.c | 2 +- src/modules/packages/packages.c | 2 +- src/modules/player/player.c | 2 +- src/modules/poweradapter/poweradapter.c | 2 +- src/modules/processes/processes.c | 2 +- src/modules/publicip/publicip.c | 2 +- src/modules/shell/shell.c | 2 +- src/modules/sound/sound.c | 2 +- src/modules/swap/swap.c | 2 +- src/modules/terminal/terminal.c | 2 +- src/modules/terminalfont/terminalfont.c | 2 +- src/modules/theme/theme.c | 2 +- src/modules/uptime/uptime.c | 2 +- src/modules/users/users.c | 2 +- src/modules/vulkan/vulkan.c | 2 +- src/modules/wallpaper/wallpaper.c | 2 +- src/modules/weather/weather.c | 2 +- src/modules/wifi/wifi.c | 2 +- src/modules/wm/wm.c | 2 +- src/modules/wmtheme/wmtheme.c | 2 +- 54 files changed, 154 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15907a3a3..5a843e906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Features: * Support QTerminal version & terminal font detection * Support MATE Terminal version & terminal font detection * Add `--no-buffer` option for easier debugging. CMake option `ENABLE_BUFFER` is removed and always enabled. +* Support `--*-key-color` option to change the key color of specified module # 1.11.3 diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 9defa2572..cd4dbdcf6 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -16,6 +16,11 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* ffStrbufSetNS(&moduleArgs->key, (uint32_t) yyjson_get_len(val), yyjson_get_str(val)); return true; } + else if(strcasecmp(key, "keyColor") == 0) + { + ffOptionParseColor(yyjson_get_str(val), &moduleArgs->keyColor); + return true; + } else if(strcasecmp(key, "format") == 0) { ffStrbufSetNS(&moduleArgs->outputFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val)); diff --git a/src/common/option.c b/src/common/option.c index cc58fc5de..6b8496e3d 100644 --- a/src/common/option.c +++ b/src/common/option.c @@ -33,6 +33,16 @@ bool ffOptionParseModuleArgs(const char* argumentKey, const char* subKey, const ffOptionParseString(argumentKey, value, &result->key); return true; } + else if(strcasecmp(subKey, "key-color") == 0) + { + if(value == NULL) + { + fprintf(stderr, "Error: usage: %s \n", argumentKey); + exit(477); + } + ffOptionParseColor(value, &result->keyColor); + return true; + } else if(strcasecmp(subKey, "format") == 0) { ffOptionParseString(argumentKey, value, &result->outputFormat); @@ -132,11 +142,13 @@ void ffOptionParseColor(const char* value, FFstrbuf* buffer) void ffOptionInitModuleArg(FFModuleArgs* args) { ffStrbufInit(&args->key); + ffStrbufInit(&args->keyColor); ffStrbufInit(&args->outputFormat); } void ffOptionDestroyModuleArg(FFModuleArgs* args) { ffStrbufDestroy(&args->key); + ffStrbufDestroy(&args->keyColor); ffStrbufDestroy(&args->outputFormat); } diff --git a/src/common/option.h b/src/common/option.h index 992417430..07aded18d 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -5,6 +5,7 @@ typedef struct FFModuleArgs { FFstrbuf key; + FFstrbuf keyColor; FFstrbuf outputFormat; } FFModuleArgs; diff --git a/src/common/printing.c b/src/common/printing.c index 896ca7a66..97aacb62b 100644 --- a/src/common/printing.c +++ b/src/common/printing.c @@ -2,7 +2,7 @@ #include "common/printing.h" #include "util/textModifier.h" -void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat) +void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor) { ffLogoPrintLine(instance); @@ -13,7 +13,10 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod if(!instance->config.pipe) { fputs(FASTFETCH_TEXT_MODIFIER_RESET FASTFETCH_TEXT_MODIFIER_BOLT, stdout); - ffPrintColor(&instance->config.colorKeys); + if(customKeyColor != NULL && customKeyColor->length > 0) + ffPrintColor(customKeyColor); + else + ffPrintColor(&instance->config.colorKeys); } //NULL check is required for modules with custom keys, e.g. disk with the folder path @@ -42,14 +45,14 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout); } -void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments) +void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments) { FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateA(256); ffParseFormatString(&buffer, format, numArgs, arguments); if(buffer.length > 0) { - ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat); + ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat, customKeyColor); ffPrintUserString(buffer.chars); putchar('\n'); } @@ -57,15 +60,15 @@ void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t m void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments) { - ffPrintFormatString(instance, moduleName, moduleIndex, &moduleArgs->key, &moduleArgs->outputFormat, numArgs, arguments); + ffPrintFormatString(instance, moduleName, moduleIndex, &moduleArgs->key, &moduleArgs->keyColor, &moduleArgs->outputFormat, numArgs, arguments); } -static void printError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, va_list arguments) +static void printError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor, const char* message, va_list arguments) { if(!instance->config.showErrors) return; - ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat); + ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat, customKeyColor); if(!instance->config.pipe) fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout); @@ -78,11 +81,11 @@ static void printError(FFinstance* instance, const char* moduleName, uint8_t mod putchar('\n'); } -void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, ...) +void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor, const char* message, ...) { va_list arguments; va_start(arguments, message); - printError(instance, moduleName, moduleIndex, customKeyFormat, message, arguments); + printError(instance, moduleName, moduleIndex, customKeyFormat, customKeyColor, message, arguments); va_end(arguments); } @@ -90,7 +93,7 @@ void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIn { va_list arguments; va_start(arguments, message); - printError(instance, moduleName, moduleIndex, &moduleArgs->key, message, arguments); + printError(instance, moduleName, moduleIndex, &moduleArgs->key, &moduleArgs->keyColor, message, arguments); va_end(arguments); } diff --git a/src/common/printing.h b/src/common/printing.h index ef189d197..801ef7e8e 100644 --- a/src/common/printing.h +++ b/src/common/printing.h @@ -6,10 +6,10 @@ #include "fastfetch.h" #include "common/format.h" -void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat); -void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments); +void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor); +void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments); void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments); -FF_C_PRINTF(5, 6) void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, ...); +FF_C_PRINTF(6, 7) void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customKeyColor, const char* message, ...); FF_C_PRINTF(5, 6) void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...); void ffPrintColor(const FFstrbuf* colorValue); void ffPrintCharTimes(char c, uint32_t times); diff --git a/src/data/json_schema.jsonc b/src/data/json_schema.jsonc index 61de25f6d..28463cf5c 100644 --- a/src/data/json_schema.jsonc +++ b/src/data/json_schema.jsonc @@ -4,6 +4,19 @@ "colors": { "type": "string", "enum": ["reset_", "bright_", "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"] + }, + "key": { + "title": "Key of the module", + "type": "string" + }, + "keyColor": { + "title": "Color of the module key", + "$ref": "#/$defs/colors", + "default": "Use display.color.keys" + }, + "format": { + "title": "Format of the module", + "type": "string" } }, "type": "object", @@ -453,12 +466,13 @@ ] }, "key": { - "title": "Key of the module", - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "title": "Format of the module", - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -478,10 +492,13 @@ "default": false }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -497,10 +514,13 @@ "default": false }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -516,10 +536,13 @@ "default": false }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -539,10 +562,13 @@ "type": "string" }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -558,6 +584,9 @@ "type": "string", "default": "*empty*" }, + "keyColor": { + "$ref": "#/$defs/keyColor" + }, "format": { "title": "Text to print", "type": "string" @@ -587,10 +616,13 @@ "default": true }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -626,10 +658,13 @@ "default": false }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -655,10 +690,13 @@ "default": "none" }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -698,10 +736,13 @@ "type": "string" }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false @@ -717,10 +758,13 @@ "default": "auto" }, "key": { - "type": "string" + "$ref": "#/$defs/key" + }, + "keyColor": { + "$ref": "#/$defs/keyColor" }, "format": { - "type": "string" + "$ref": "#/$defs/format" } }, "additionalProperties": false diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index ea82b64da..1c962f325 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -10,7 +10,7 @@ static void printBattery(FFinstance* instance, FFBatteryOptions* options, Batter { if(instance->config.battery.moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_BATTERY_MODULE_NAME, index, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_BATTERY_MODULE_NAME, index, &options->moduleArgs.key, &options->moduleArgs.keyColor); bool showStatus = !(instance->config.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT) && diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index b898217b3..1eac53bac 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -29,7 +29,7 @@ void ffPrintBios(FFinstance* instance, FFBiosOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_BIOS_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_BIOS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); puts(bios.biosRelease.chars); } else diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 744bc549b..aabed5444 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -9,7 +9,7 @@ static void printDevice(FFinstance* instance, FFBluetoothOptions* options, const { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&device->name, stdout); if(device->battery > 0) diff --git a/src/modules/board/board.c b/src/modules/board/board.c index a984e9427..c8913c90d 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -24,7 +24,7 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); puts(result.boardName.chars); } else diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 8dde00757..9dcd77971 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -40,12 +40,12 @@ void ffPrintBrightness(FFinstance* instance, FFBrightnessOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, key.chars, 0, NULL); + ffPrintLogoAndKey(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor); printf("%.0f%%\n", item->value); } else { - ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.outputFormat, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) { + ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor, &options->moduleArgs.outputFormat, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) { {FF_FORMAT_ARG_TYPE_STRBUF, &item->value}, {FF_FORMAT_ARG_TYPE_FLOAT, &item->name} }); diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index ac6a41354..65b3282fc 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -28,7 +28,7 @@ void ffPrintChassis(FFinstance* instance, FFChassisOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); FF_STRBUF_AUTO_DESTROY output = ffStrbufCreateCopy(&result.chassisType); diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 69d0729aa..8e986ad3e 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -29,7 +29,7 @@ void ffPrintCommand(FFinstance* instance, FFCommandOptions* options) return; } - ffPrintLogoAndKey(instance, FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&result, stdout); } diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index c8cc7a452..71e016aa8 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -28,7 +28,7 @@ void ffPrintCPU(FFinstance* instance, FFCPUOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_CPU_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_CPU_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(cpu.name.length > 0) ffStrbufWriteTo(&cpu.name, stdout); diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 9df218d8f..bef65706c 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -20,7 +20,7 @@ void ffPrintCPUUsage(FFinstance* instance, FFCPUUsageOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate(); if(instance->config.percentType & FF_PERCENTAGE_TYPE_BAR_BIT) diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 095dc7dba..61be4a105 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -27,7 +27,7 @@ void ffPrintCursor(FFinstance* instance, FFCursorOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&result.theme, stdout); if(result.size.length > 0) diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index ce57e5c5e..e81615881 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -11,7 +11,7 @@ void ffPrintCustom(FFinstance* instance, FFCustomOptions* options) return; } - ffPrintLogoAndKey(instance, options->moduleArgs.key.length == 0 ? NULL : FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, options->moduleArgs.key.length == 0 ? NULL : FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffPrintUserString(options->moduleArgs.outputFormat.chars); puts(FASTFETCH_TEXT_MODIFIER_RESET); } diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index 03ac5b92d..508b0bdfa 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -42,7 +42,7 @@ void ffPrintDateTime(FFinstance* instance, FFDateTimeOptions* options) } const FFDateTimeResult* datetime = ffDetectDateTime(instance); - ffPrintLogoAndKey(instance, FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); //yyyy-MM-dd HH:mm:ss printf("%u-%s-%02u %s:%s:%s\n", datetime->year, datetime->monthPretty.chars, datetime->dayInMonth, datetime->hourPretty.chars, datetime->minutePretty.chars, datetime->secondPretty.chars); diff --git a/src/modules/de/de.c b/src/modules/de/de.c index b0f709a29..806b65f85 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -17,7 +17,7 @@ void ffPrintDE(FFinstance* instance, FFDEOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&result->dePrettyName, stdout); diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 68b1e249d..2824f907d 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -33,7 +33,7 @@ static void printDisk(FFinstance* instance, FFDiskOptions* options, const FFDisk if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, key.chars, 0, NULL); + ffPrintLogoAndKey(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor); FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate(); @@ -78,7 +78,7 @@ static void printDisk(FFinstance* instance, FFDiskOptions* options, const FFDisk bool isExternal = !!(disk->type & FF_DISK_TYPE_EXTERNAL_BIT); bool isHidden = !!(disk->type & FF_DISK_TYPE_HIDDEN_BIT); - ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.outputFormat, FF_DISK_NUM_FORMAT_ARGS, (FFformatarg[]){ + ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor, &options->moduleArgs.outputFormat, FF_DISK_NUM_FORMAT_ARGS, (FFformatarg[]){ {FF_FORMAT_ARG_TYPE_STRBUF, &usedPretty}, {FF_FORMAT_ARG_TYPE_STRBUF, &totalPretty}, {FF_FORMAT_ARG_TYPE_UINT8, &bytesPercentage}, diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 354b0061d..e59435dab 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -22,7 +22,7 @@ void ffPrintDisplay(FFinstance* instance, FFDisplayOptions* options) if (options->compactType != FF_DISPLAY_COMPACT_TYPE_NONE) { - ffPrintLogoAndKey(instance, FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); int index = 0; FF_LIST_FOR_EACH(FFDisplayResult, result, dsResult->displays) @@ -67,11 +67,11 @@ void ffPrintDisplay(FFinstance* instance, FFDisplayOptions* options) {FF_FORMAT_ARG_TYPE_STRING, displayType}, }); } - ffPrintLogoAndKey(instance, key.chars, 0, NULL); + ffPrintLogoAndKey(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor); } else { - ffPrintLogoAndKey(instance, FF_DISPLAY_MODULE_NAME, moduleIndex, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_DISPLAY_MODULE_NAME, moduleIndex, &options->moduleArgs.key, &options->moduleArgs.keyColor); } printf("%ix%i", result->width, result->height); diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 59736afb8..cd3875c10 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -22,7 +22,7 @@ void ffPrintFont(FFinstance* instance, FFFontOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_FONT_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_FONT_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&font.display, stdout); } else diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 86edbb683..1a79a624d 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -9,7 +9,7 @@ static void printDevice(FFinstance* instance, FFGamepadOptions* options, const F { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&device->name, stdout); } else diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 41a8ff682..2fff072a6 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -14,7 +14,7 @@ static void printGPUResult(FFinstance* instance, FFGPUOptions* options, uint8_t { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_GPU_MODULE_NAME, index, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_GPU_MODULE_NAME, index, &options->moduleArgs.key, &options->moduleArgs.keyColor); FF_STRBUF_AUTO_DESTROY output = ffStrbufCreateA(gpu->vendor.length + 1 + gpu->name.length); diff --git a/src/modules/host/host.c b/src/modules/host/host.c index b6c7f5b73..f306bdf1a 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -24,7 +24,7 @@ void ffPrintHost(FFinstance* instance, FFHostOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_HOST_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_HOST_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); FF_STRBUF_AUTO_DESTROY output = ffStrbufCreate(); diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index b917e6857..c4fb36c0b 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -18,7 +18,7 @@ void ffPrintIcons(FFinstance* instance, FFIconsOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_ICONS_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_ICONS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&icons, stdout); } else diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 9cce738ea..cf824efac 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -8,7 +8,7 @@ void ffPrintKernel(FFinstance* instance, FFKernelOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&instance->state.platform.systemRelease, stdout); #ifdef _WIN32 diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index d8d7abe72..a849fbd6f 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -18,7 +18,7 @@ void ffPrintLocale(FFinstance* instance, FFLocaleOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&locale, stdout); } else diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 06dc74189..011020bf9 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -75,7 +75,7 @@ void ffPrintLocalIp(FFinstance* instance, FFLocalIpOptions* options) if (options->showType & FF_LOCALIP_TYPE_COMPACT_BIT) { - ffPrintLogoAndKey(instance, FF_LOCALIP_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_LOCALIP_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); FF_LIST_FOR_EACH(FFLocalIpResult, ip, results) { @@ -93,13 +93,13 @@ void ffPrintLocalIp(FFinstance* instance, FFLocalIpOptions* options) formatKey(options, ip, &key); if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, key.chars, 0, NULL); + ffPrintLogoAndKey(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor); printIp(ip); putchar('\n'); } else { - ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.outputFormat, FF_LOCALIP_NUM_FORMAT_ARGS, (FFformatarg[]){ + ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.keyColor, &options->moduleArgs.outputFormat, FF_LOCALIP_NUM_FORMAT_ARGS, (FFformatarg[]){ {FF_FORMAT_ARG_TYPE_STRBUF, &ip->ipv4}, {FF_FORMAT_ARG_TYPE_STRBUF, &ip->ipv6}, {FF_FORMAT_ARG_TYPE_STRBUF, &ip->mac}, diff --git a/src/modules/media/media.c b/src/modules/media/media.c index ac5ce83b3..a841773fa 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -79,7 +79,7 @@ void ffPrintMedia(FFinstance* instance, FFMediaOptions* options) if(artistInSongTitle(&songPretty, &artistPretty)) ffStrbufClear(&artistPretty); - ffPrintLogoAndKey(instance, FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(artistPretty.length > 0) { diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 3e175eea6..9d4133694 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -30,7 +30,7 @@ void ffPrintMemory(FFinstance* instance, FFMemoryOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if (storage.bytesTotal == 0) puts("Disabled"); else diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index 469b59cb2..5b52cd230 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -20,7 +20,7 @@ void ffPrintOpenCL(FFinstance* instance, FFOpenCLOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&opencl.version, stdout); } else diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 46924ceaa..27f5f32a4 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -22,7 +22,7 @@ void ffPrintOpenGL(FFinstance* instance, FFOpenGLOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); puts(result.version.chars); } else diff --git a/src/modules/os/os.c b/src/modules/os/os.c index f057aa762..0d4e67554 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -114,7 +114,7 @@ void ffPrintOS(FFinstance* instance, FFOSOptions* options) else buildOutputDefault(instance, os, &result); - ffPrintLogoAndKey(instance, FF_OS_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_OS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&result, stdout); } else diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 6f369fa42..c6fd4c9dc 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -20,7 +20,7 @@ void ffPrintPackages(FFinstance* instance, FFPackagesOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); #define FF_PRINT_PACKAGE_NAME(var, name) \ if(counts.var > 0) \ diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 6c0644a85..1b94c3f04 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -58,7 +58,7 @@ void ffPrintPlayer(FFinstance* instance, FFPlayerOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&playerPretty, stdout); } else diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 3c858942c..f176d13f1 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -31,7 +31,7 @@ void ffPrintPowerAdapter(FFinstance* instance, FFPowerAdapterOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(result->name.length > 0) puts(result->name.chars); diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index c09792537..4aa09318e 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -18,7 +18,7 @@ void ffPrintProcesses(FFinstance* instance, FFProcessesOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); printf("%u\n", numProcesses); } diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 464acb5c4..b873b7e71 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -54,7 +54,7 @@ void ffPrintPublicIp(FFinstance* instance, FFPublicIpOptions* options) if (options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_PUBLICIP_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_PUBLICIP_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&result, stdout); } else diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index c6efb899c..343932ad9 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -17,7 +17,7 @@ void ffPrintShell(FFinstance* instance, FFShellOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_SHELL_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_SHELL_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&result->shellPrettyName, stdout); if(result->shellVersion.length > 0) diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index c5deab69a..9756cdf86 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -9,7 +9,7 @@ static void printDevice(FFinstance* instance, FFSoundOptions* options, const FFS { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_SOUND_MODULE_NAME, index, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_SOUND_MODULE_NAME, index, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&device->name, stdout); if(device->volume != FF_SOUND_VOLUME_UNKNOWN) diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index af788bbe8..92c7a2837 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -30,7 +30,7 @@ void ffPrintSwap(FFinstance* instance, FFSwapOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_SWAP_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_SWAP_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if (storage.bytesTotal == 0) puts("Disabled"); else diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 4d7db5b46..7dfbbe3c9 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -19,7 +19,7 @@ void ffPrintTerminal(FFinstance* instance, FFTerminalOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(result->terminalVersion.length) printf("%s %s\n", result->terminalPrettyName.chars, result->terminalVersion.chars); diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 8c56d71c2..1ac69048d 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -20,7 +20,7 @@ void ffPrintTerminalFont(FFinstance* instance, FFTerminalFontOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&terminalFont.font.pretty, stdout); } else diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 63d16ba56..9bd382e4e 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -18,7 +18,7 @@ void ffPrintTheme(FFinstance* instance, FFThemeOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_THEME_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_THEME_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&theme, stdout); } else diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 5218c7a6a..1cd92b1ba 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -24,7 +24,7 @@ void ffPrintUptime(FFinstance* instance, FFUptimeOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(days == 0 && hours == 0 && minutes == 0) { diff --git a/src/modules/users/users.c b/src/modules/users/users.c index b3ed8389a..492ecbb61 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -31,7 +31,7 @@ void ffPrintUsers(FFinstance* instance, FFUsersOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_USERS_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_USERS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); puts(result.chars); } else diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index c9786cf2a..276a3f70f 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -17,7 +17,7 @@ void ffPrintVulkan(FFinstance* instance, FFVulkanOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(vulkan->apiVersion.length > 0) { diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 936442c6c..ccc8c95e5 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -18,7 +18,7 @@ void ffPrintWallpaper(FFinstance* instance, FFWallpaperOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&wallpaper, stdout); } else diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index ae6c73f3b..3d7637a7f 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -38,7 +38,7 @@ void ffPrintWeather(FFinstance* instance, FFWeatherOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufPutTo(&result, stdout); } else diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 2511a8857..380457937 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -28,7 +28,7 @@ void ffPrintWifi(FFinstance* instance, FFWifiOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &options->moduleArgs.key, &options->moduleArgs.keyColor); if(item->conn.ssid.length) { ffStrbufWriteTo(&item->conn.ssid, stdout); diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 4e04b0c71..7aa1c534f 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -17,7 +17,7 @@ void ffPrintWM(FFinstance* instance, FFWMOptions* options) if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_WM_MODULE_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_WM_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&result->wmPrettyName, stdout); diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index d0273975a..8f1ab4441 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -13,7 +13,7 @@ void ffPrintWMTheme(FFinstance* instance, FFWMThemeOptions* options) { if(options->moduleArgs.outputFormat.length == 0) { - ffPrintLogoAndKey(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs.key); + ffPrintLogoAndKey(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); puts(themeOrError.chars); } else