diff --git a/src/common/option.c b/src/common/option.c index a8fb48ec5..50a336e69 100644 --- a/src/common/option.c +++ b/src/common/option.c @@ -205,20 +205,3 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer) #undef FF_APPEND_COLOR_PROP_COND } } - -void ffOptionInitModuleArg(FFModuleArgs* args) -{ - ffStrbufInit(&args->key); - ffStrbufInit(&args->keyColor); - ffStrbufInit(&args->outputFormat); - ffStrbufInit(&args->outputColor); - args->keyWidth = 0; -} - -void ffOptionDestroyModuleArg(FFModuleArgs* args) -{ - ffStrbufDestroy(&args->key); - ffStrbufDestroy(&args->keyColor); - ffStrbufDestroy(&args->outputFormat); - ffStrbufDestroy(&args->outputColor); -} diff --git a/src/common/option.h b/src/common/option.h index 8fce76c83..1c4158f73 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -45,12 +45,21 @@ static inline void ffOptionInitModuleBaseInfo( baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig; } +typedef enum FFModuleKeyType +{ + FF_MODULE_KEY_TYPE_NONE = 0, + FF_MODULE_KEY_TYPE_STRING = 0 << 1, + FF_MODULE_KEY_TYPE_KEY = 1 << 1, + FF_MODULE_KEY_TYPE_BOTH = FF_MODULE_KEY_TYPE_STRING | FF_MODULE_KEY_TYPE_KEY, +} FFModuleKeyType; + typedef struct FFModuleArgs { FFstrbuf key; FFstrbuf keyColor; FFstrbuf outputFormat; FFstrbuf outputColor; + FFstrbuf icon; uint32_t keyWidth; } FFModuleArgs; @@ -73,5 +82,22 @@ static inline void ffOptionParseColor(const char* value, FFstrbuf* buffer) ffStrbufClear(buffer); ffOptionParseColorNoClear(value, buffer); } -void ffOptionInitModuleArg(FFModuleArgs* args); -void ffOptionDestroyModuleArg(FFModuleArgs* args); + +static inline void ffOptionInitModuleArg(FFModuleArgs* args, const char* icon) +{ + ffStrbufInit(&args->key); + ffStrbufInit(&args->keyColor); + ffStrbufInit(&args->outputFormat); + ffStrbufInit(&args->outputColor); + ffStrbufInitStatic(&args->icon, icon); + args->keyWidth = 0; +} + +static inline void ffOptionDestroyModuleArg(FFModuleArgs* args) +{ + ffStrbufDestroy(&args->key); + ffStrbufDestroy(&args->keyColor); + ffStrbufDestroy(&args->outputFormat); + ffStrbufDestroy(&args->outputColor); + ffStrbufDestroy(&args->icon); +} diff --git a/src/common/printing.c b/src/common/printing.c index a52f2c279..515556609 100644 --- a/src/common/printing.c +++ b/src/common/printing.c @@ -36,8 +36,9 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu else { FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate(); - FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 1, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 2, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex, "index"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &moduleArgs->icon, "icon"}, })); ffStrbufWriteTo(&key, stdout); } diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index f098bf6ec..8b65506a2 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -251,7 +251,7 @@ void ffInitBatteryOptions(FFBatteryOptions* options) ffPrintBatteryHelpFormat, ffGenerateBatteryJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->temp = false; options->tempConfig = (FFColorRangeConfig) { 60, 80 }; options->percent = (FFColorRangeConfig) { 50, 20 }; diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index b9a4fc902..194a761f1 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -167,7 +167,7 @@ void ffInitBiosOptions(FFBiosOptions* options) ffPrintBiosHelpFormat, ffGenerateBiosJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyBiosOptions(FFBiosOptions* options) diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index d3c089df4..fa010ec9b 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -200,7 +200,7 @@ void ffInitBluetoothOptions(FFBluetoothOptions* options) ffPrintBluetoothHelpFormat, ffGenerateBluetoothJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->showDisconnected = false; options->percent = (FFColorRangeConfig) { 50, 20 }; } diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 26db6a18d..c40f4da33 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -145,7 +145,7 @@ void ffInitBoardOptions(FFBoardOptions* options) ffPrintBoardHelpFormat, ffGenerateBoardJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyBoardOptions(FFBoardOptions* options) diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index dfdbdc452..680d11cc6 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -134,7 +134,7 @@ void ffInitBootmgrOptions(FFBootmgrOptions* options) ffPrintBootmgrHelpFormat, ffGenerateBootmgrJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyBootmgrOptions(FFBootmgrOptions* options) diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 8030c6bef..cbec1a929 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -200,7 +200,7 @@ void ffInitBrightnessOptions(FFBrightnessOptions* options) ffPrintBrightnessHelpFormat, ffGenerateBrightnessJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰯪"); options->ddcciSleep = 10; options->percent = (FFColorRangeConfig) { 100, 100 }; diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 0eb449052..6a9b22d54 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -161,7 +161,7 @@ void ffInitCameraOptions(FFCameraOptions* options) ffPrintCameraHelpFormat, ffGenerateCameraJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰄀"); } void ffDestroyCameraOptions(FFCameraOptions* options) diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index e3948bdec..4e1e6c767 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -146,7 +146,7 @@ void ffInitChassisOptions(FFChassisOptions* options) ffPrintChassisHelpFormat, ffGenerateChassisJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyChassisOptions(FFChassisOptions* options) diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index c78450bcc..4b6c8a9e9 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -293,7 +293,7 @@ void ffInitColorsOptions(FFColorsOptions* options) NULL, ffGenerateColorsJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); ffStrbufSetStatic(&options->moduleArgs.key, " "); options->symbol = FF_COLORS_SYMBOL_BACKGROUND; options->paddingLeft = 0; diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 6eb888407..6fa23c4cf 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -159,7 +159,7 @@ void ffInitCommandOptions(FFCommandOptions* options) ffPrintCommandHelpFormat, ffGenerateCommandJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); ffStrbufInitStatic(&options->shell, #ifdef _WIN32 diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index eef95001f..72391793b 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -265,7 +265,7 @@ void ffInitCPUOptions(FFCPUOptions* options) ffPrintCPUHelpFormat, ffGenerateCPUJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->temp = false; options->tempConfig = (FFColorRangeConfig) { 60, 80 }; options->showPeCoreCount = false; diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index d728929bf..98463bc86 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -248,7 +248,7 @@ void ffInitCPUCacheOptions(FFCPUCacheOptions* options) ffPrintCPUCacheHelpFormat, ffGenerateCPUCacheJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->compact = false; } diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 1629e237a..d09ae9080 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -200,7 +200,7 @@ void ffInitCPUUsageOptions(FFCPUUsageOptions* options) ffPrintCPUUsageHelpFormat, ffGenerateCPUUsageJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓅"); options->separate = false; options->percent = (FFColorRangeConfig) { 50, 80 }; } diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 64e60e666..579db4d59 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -131,7 +131,7 @@ void ffInitCursorOptions(FFCursorOptions* options) ffPrintCursorHelpFormat, ffGenerateCursorJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰆿"); } void ffDestroyCursorOptions(FFCursorOptions* options) diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index 1c5d829b3..b31c6a0dc 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -57,8 +57,8 @@ void ffInitCustomOptions(FFCustomOptions* options) NULL, ffGenerateCustomJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); - ffStrbufSetStatic(&options->moduleArgs.key, " "); + ffOptionInitModuleArg(&options->moduleArgs, ""); + ffStrbufSetStatic(&options->moduleArgs.key, ""); } void ffDestroyCustomOptions(FFCustomOptions* options) diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index b583e642b..f7c657842 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -196,7 +196,7 @@ void ffInitDateTimeOptions(FFDateTimeOptions* options) ffPrintDateTimeHelpFormat, ffGenerateDateTimeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyDateTimeOptions(FFDateTimeOptions* options) diff --git a/src/modules/de/de.c b/src/modules/de/de.c index 998742ef0..9c293d146 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -135,7 +135,7 @@ void ffInitDEOptions(FFDEOptions* options) ffPrintDEHelpFormat, ffGenerateDEJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->slowVersionDetection = false; } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 3996ff647..f2b3e11be 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -465,7 +465,7 @@ void ffInitDiskOptions(FFDiskOptions* options) ffPrintDiskHelpFormat, ffGenerateDiskJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); ffStrbufInit(&options->folders); options->showTypes = FF_DISK_VOLUME_TYPE_REGULAR_BIT | FF_DISK_VOLUME_TYPE_EXTERNAL_BIT | FF_DISK_VOLUME_TYPE_READONLY_BIT; diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index dbe52f061..25a429d90 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -217,7 +217,7 @@ void ffInitDiskIOOptions(FFDiskIOOptions* options) ffPrintDiskIOHelpFormat, ffGenerateDiskIOJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓅"); ffStrbufInit(&options->namePrefix); options->detectTotal = false; diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 93cdecbe5..3a3ab9216 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -377,7 +377,7 @@ void ffInitDisplayOptions(FFDisplayOptions* options) ffPrintDisplayHelpFormat, ffGenerateDisplayJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰍹"); options->compactType = FF_DISPLAY_COMPACT_TYPE_NONE; options->preciseRefreshRate = false; } diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index e848539fe..3eef47be2 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -183,7 +183,7 @@ void ffInitDNSOptions(FFDNSOptions* options) ffPrintDNSHelpFormat, ffGenerateDNSJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰇖"); options->showType = FF_DNS_TYPE_BOTH; } diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index c7ac703b1..9f251a9af 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -142,7 +142,7 @@ void ffInitEditorOptions(FFEditorOptions* options) ffPrintEditorHelpFormat, ffGenerateEditorJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󱞎"); } void ffDestroyEditorOptions(FFEditorOptions* options) diff --git a/src/modules/font/font.c b/src/modules/font/font.c index f6014f1a7..a0bd9121f 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -128,7 +128,7 @@ void ffInitFontOptions(FFFontOptions* options) ffPrintFontHelpFormat, ffGenerateFontJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyFontOptions(FFFontOptions* options) diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index e6fff3622..988fc3a1e 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -159,7 +159,7 @@ void ffInitGamepadOptions(FFGamepadOptions* options) ffPrintGamepadHelpFormat, ffGenerateGamepadJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰺵"); options->percent = (FFColorRangeConfig) { 50, 20 }; } diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index a653b34ac..6c89d806a 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -416,7 +416,7 @@ void ffInitGPUOptions(FFGPUOptions* options) ffPrintGPUHelpFormat, ffGenerateGPUJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰾲"); options->driverSpecific = false; options->detectionMethod = FF_GPU_DETECTION_METHOD_AUTO; diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 229c5a4d3..8e2d4b9a7 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -173,7 +173,7 @@ void ffInitHostOptions(FFHostOptions* options) ffPrintHostHelpFormat, ffGenerateHostJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰌢"); } void ffDestroyHostOptions(FFHostOptions* options) diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index 51671bdeb..cf120e61f 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -123,7 +123,7 @@ void ffInitIconsOptions(FFIconsOptions* options) ffPrintIconsHelpFormat, ffGenerateIconsJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyIconsOptions(FFIconsOptions* options) diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index b9e7edfc6..fbded86b4 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -136,7 +136,7 @@ void ffInitInitSystemOptions(FFInitSystemOptions* options) ffPrintInitSystemHelpFormat, ffGenerateInitSystemJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰿄"); } void ffDestroyInitSystemOptions(FFInitSystemOptions* options) diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 5e171faf5..920f525a4 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -106,7 +106,7 @@ void ffInitKernelOptions(FFKernelOptions* options) ffPrintKernelHelpFormat, ffGenerateKernelJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰧑"); } void ffDestroyKernelOptions(FFKernelOptions* options) diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index e2ef46080..58746f924 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -137,7 +137,7 @@ void ffInitLMOptions(FFLMOptions* options) ffPrintLMHelpFormat, ffGenerateLMJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰍂"); } void ffDestroyLMOptions(FFLMOptions* options) diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 5d7de3582..46a9c3489 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -202,7 +202,7 @@ void ffInitLoadavgOptions(FFLoadavgOptions* options) ffPrintLoadavgHelpFormat, ffGenerateLoadavgJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->percent = (FFColorRangeConfig) { 50, 80 }; options->ndigits = 2; diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 33bb5003c..36f43de10 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -99,7 +99,7 @@ void ffInitLocaleOptions(FFLocaleOptions* options) ffPrintLocaleHelpFormat, ffGenerateLocaleJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyLocaleOptions(FFLocaleOptions* options) diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 0825060a2..7c8d43add 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -411,7 +411,7 @@ void ffInitLocalIpOptions(FFLocalIpOptions* options) ffPrintLocalIpHelpFormat, ffGenerateLocalIpJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰩟"); options->showType = FF_LOCALIP_TYPE_IPV4_BIT | FF_LOCALIP_TYPE_PREFIX_LEN_BIT #ifndef __ANDROID__ diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 691511bc2..64e6edd2b 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -181,7 +181,7 @@ void ffInitMediaOptions(FFMediaOptions* options) ffPrintMediaHelpFormat, ffGenerateMediaJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyMediaOptions(FFMediaOptions* options) diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 832fecf20..2d6bc6d83 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -151,7 +151,7 @@ void ffInitMemoryOptions(FFMemoryOptions* options) ffPrintMemoryHelpFormat, ffGenerateMemoryJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->percent = (FFColorRangeConfig) { 50, 80 }; } diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index c090f3d6c..874346887 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -212,7 +212,7 @@ void ffInitMonitorOptions(FFMonitorOptions* options) ffPrintMonitorHelpFormat, ffGenerateMonitorJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰹑"); } void ffDestroyMonitorOptions(FFMonitorOptions* options) diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index cc4a70238..1b3179915 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -247,7 +247,7 @@ void ffInitNetIOOptions(FFNetIOOptions* options) ffPrintNetIOHelpFormat, ffGenerateNetIOJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓅"); ffStrbufInit(&options->namePrefix); options->defaultRouteOnly = diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index a74328661..2f69be3bf 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -152,7 +152,7 @@ void ffInitOpenCLOptions(FFOpenCLOptions* options) ffPrintOpenCLHelpFormat, ffGenerateOpenCLJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyOpenCLOptions(FFOpenCLOptions* options) diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index d5d56b834..aea90dbb6 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -183,7 +183,7 @@ void ffInitOpenGLOptions(FFOpenGLOptions* options) ffPrintOpenGLHelpFormat, ffGenerateOpenGLJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->library = FF_OPENGL_LIBRARY_AUTO; } diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 6a02dac3b..bb6edb659 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -217,7 +217,23 @@ void ffInitOSOptions(FFOSOptions* options) ffPrintOSHelpFormat, ffGenerateOSJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, + #ifdef _WIN32 + "" + #elif __APPLE__ + "" + #elif __FreeBSD__ + "󰣠" + #elif __linux__ + "" + #elif __ANDROID__ + "" + #elif __sun + "" + #else + "?" + #endif + ); } void ffDestroyOSOptions(FFOSOptions* options) diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index e6cb5fb1a..175a365ab 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -464,7 +464,7 @@ void ffInitPackagesOptions(FFPackagesOptions* options) ffPrintPackagesHelpFormat, ffGeneratePackagesJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰏖"); options->disabled = FF_PACKAGES_FLAG_WINGET_BIT; } diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index ef042382d..e6695d1f9 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -278,7 +278,7 @@ void ffInitPhysicalDiskOptions(FFPhysicalDiskOptions* options) ffPrintPhysicalDiskHelpFormat, ffGeneratePhysicalDiskJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰋊"); ffStrbufInit(&options->namePrefix); options->temp = false; diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 68d8d61de..84e62eb90 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -178,7 +178,7 @@ void ffInitPhysicalMemoryOptions(FFPhysicalMemoryOptions* options) ffPrintPhysicalMemoryHelpFormat, ffGeneratePhysicalMemoryJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰑭"); } void ffDestroyPhysicalMemoryOptions(FFPhysicalMemoryOptions* options) diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 4e97da8ae..712d64351 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -156,7 +156,7 @@ void ffInitPlayerOptions(FFPlayerOptions* options) ffPrintPlayerHelpFormat, ffGeneratePlayerJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰥠"); } void ffDestroyPlayerOptions(FFPlayerOptions* options) diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index b5c570a1c..cadbfbbb9 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -151,7 +151,7 @@ void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options) ffPrintPowerAdapterHelpFormat, ffGeneratePowerAdapterJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰚥"); } void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options) diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index 77cf64275..f50cb3ea2 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -100,7 +100,7 @@ void ffInitProcessesOptions(FFProcessesOptions* options) ffPrintProcessesHelpFormat, ffGenerateProcessesJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyProcessesOptions(FFProcessesOptions* options) diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index daf09593c..aa94d02a0 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -162,7 +162,7 @@ void ffInitPublicIpOptions(FFPublicIpOptions* options) ffPrintPublicIpHelpFormat, ffGeneratePublicIpJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰩠"); ffStrbufInit(&options->url); options->timeout = 0; diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index ef0c6f79e..6d7edb177 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -131,7 +131,7 @@ void ffInitShellOptions(FFShellOptions* options) ffPrintShellHelpFormat, ffGenerateShellJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyShellOptions(FFShellOptions* options) diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index 3ca23491a..485ca7555 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -250,7 +250,7 @@ void ffInitSoundOptions(FFSoundOptions* options) ffPrintSoundHelpFormat, ffGenerateSoundJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓃"); options->soundType = FF_SOUND_TYPE_MAIN; options->percent = (FFColorRangeConfig) { 80, 90 }; diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 7b823f671..d3e981779 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -160,7 +160,7 @@ void ffInitSwapOptions(FFSwapOptions* options) ffPrintSwapHelpFormat, ffGenerateSwapJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓡"); options->percent = (FFColorRangeConfig) { 50, 80 }; } diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index b5f2509df..97f15fad4 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -126,7 +126,7 @@ void ffInitTerminalOptions(FFTerminalOptions* options) ffPrintTerminalHelpFormat, ffGenerateTerminalJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyTerminalOptions(FFTerminalOptions* options) diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 6dd1b17bc..87e772c31 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -144,7 +144,7 @@ void ffInitTerminalFontOptions(FFTerminalFontOptions* options) ffPrintTerminalFontHelpFormat, ffGenerateTerminalFontJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options) diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 425df3bc8..db2f2e479 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -114,7 +114,7 @@ void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options) ffPrintTerminalSizeHelpFormat, ffGenerateTerminalSizeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰲎"); } void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options) diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index 6444a0afd..ab0bde18f 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -125,7 +125,7 @@ void ffInitTerminalThemeOptions(FFTerminalThemeOptions* options) ffPrintTerminalThemeHelpFormat, ffGenerateTerminalThemeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰔎"); } void ffDestroyTerminalThemeOptions(FFTerminalThemeOptions* options) diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 2f0f8032c..8e90df093 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -123,7 +123,7 @@ void ffInitThemeOptions(FFThemeOptions* options) ffPrintThemeHelpFormat, ffGenerateThemeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰉼"); } void ffDestroyThemeOptions(FFThemeOptions* options) diff --git a/src/modules/title/title.c b/src/modules/title/title.c index bc5706749..c3b0f575e 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -205,7 +205,7 @@ void ffInitTitleOptions(FFTitleOptions* options) ffPrintTitleHelpFormat, ffGenerateTitleJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰗴"); ffStrbufSetStatic(&options->moduleArgs.key, " "); options->fqdn = false; diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 5ff4c5728..a9f91d8bd 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -165,7 +165,7 @@ void ffInitUptimeOptions(FFUptimeOptions* options) ffPrintUptimeHelpFormat, ffGenerateUptimeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyUptimeOptions(FFUptimeOptions* options) diff --git a/src/modules/users/users.c b/src/modules/users/users.c index e7ddec980..adbef14e4 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -212,7 +212,7 @@ void ffInitUsersOptions(FFUsersOptions* options) ffPrintUsersHelpFormat, ffGenerateUsersJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->compact = false; options->myselfOnly = false; diff --git a/src/modules/version/version.c b/src/modules/version/version.c index c7c729606..7382a97fc 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -141,7 +141,7 @@ void ffInitVersionOptions(FFVersionOptions* options) ffPrintVersionHelpFormat, ffGenerateVersionJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyVersionOptions(FFVersionOptions* options) diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index 64d63d52e..76e2bba26 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -167,7 +167,7 @@ void ffInitVulkanOptions(FFVulkanOptions* options) ffPrintVulkanHelpFormat, ffGenerateVulkanJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); } void ffDestroyVulkanOptions(FFVulkanOptions* options) diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 5ec868d8b..4461c63c7 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -110,7 +110,7 @@ void ffInitWallpaperOptions(FFWallpaperOptions* options) ffPrintWallpaperHelpFormat, ffGenerateWallpaperJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰸉"); } void ffDestroyWallpaperOptions(FFWallpaperOptions* options) diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 68539d3e8..14bb669a2 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -145,7 +145,7 @@ void ffInitWeatherOptions(FFWeatherOptions* options) ffPrintWeatherHelpFormat, ffGenerateWeatherJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰖙"); ffStrbufInit(&options->location); ffStrbufInitStatic(&options->outputFormat, "%t+-+%C+(%l)"); diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 16774f932..18208d3a8 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -220,7 +220,7 @@ void ffInitWifiOptions(FFWifiOptions* options) ffPrintWifiHelpFormat, ffGenerateWifiJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->percent = (FFColorRangeConfig) { 50, 20 }; } diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index a4c4156be..849053367 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -148,7 +148,7 @@ void ffInitWMOptions(FFWMOptions* options) ffPrintWMHelpFormat, ffGenerateWMJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, ""); options->detectPlugin = false; } diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 74c0e686e..5234f2b14 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -97,7 +97,7 @@ void ffInitWMThemeOptions(FFWMThemeOptions* options) ffPrintWMthemeHelpFormat, ffGenerateWMThemeJsonConfig ); - ffOptionInitModuleArg(&options->moduleArgs); + ffOptionInitModuleArg(&options->moduleArgs, "󰓸"); } void ffDestroyWMThemeOptions(FFWMThemeOptions* options)