From 3b3c1a9f633ef6ed9824f57807a423631b44415d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 24 Jul 2024 14:27:46 +0800 Subject: [PATCH] Global: support display predefined icon in custom key format --- src/modules/bios/bios.c | 3 ++- src/modules/brightness/brightness.c | 3 ++- src/modules/cpucache/cpucache.c | 3 ++- src/modules/disk/disk.c | 3 ++- src/modules/diskio/diskio.c | 3 ++- src/modules/display/display.c | 3 ++- src/modules/loadavg/loadavg.c | 3 ++- src/modules/localip/localip.c | 3 ++- src/modules/monitor/monitor.c | 3 ++- src/modules/netio/netio.c | 3 ++- src/modules/physicaldisk/physicaldisk.c | 3 ++- src/modules/title/title.c | 2 +- 12 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 194a761f1..ae1e6c7af 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -43,8 +43,9 @@ void ffPrintBios(FFBiosOptions* options) else { ffStrbufClear(&key); - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 1, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_STRBUF, &bios.type, "type"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index cbec1a929..bb79e0a79 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -37,9 +37,10 @@ void ffPrintBrightness(FFBrightnessOptions* options) else { uint32_t moduleIndex = result.length == 1 ? 0 : index + 1; - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &item->name, "name"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index 98463bc86..ef6820617 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -22,9 +22,10 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption else { uint32_t index = i + 1; - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_STRING, levelStr, "level"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index f2b3e11be..b66236d37 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -35,10 +35,11 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk) } else { - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 4, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_STRBUF, &disk->mountpoint, "mountpoint"}, {FF_FORMAT_ARG_TYPE_STRBUF, &disk->name, "name"}, {FF_FORMAT_ARG_TYPE_STRBUF, &disk->mountFrom, "mount-from"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 25a429d90..b0ac96405 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -22,10 +22,11 @@ static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint3 else { ffStrbufClear(key); - FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 4, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name, "name"}, {FF_FORMAT_ARG_TYPE_STRBUF, &dev->devPath, "dev-path"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } } diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 3a3ab9216..d89a042af 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -91,10 +91,11 @@ void ffPrintDisplay(FFDisplayOptions* options) } else { - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 4, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &result->name, "name"}, {FF_FORMAT_ARG_TYPE_STRING, displayType, "type"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 46a9c3489..26d4ffb8d 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -49,9 +49,10 @@ void ffPrintLoadavg(FFLoadavgOptions* options) else { ffStrbufClear(&buffer); - FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, 2, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, 3, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_UINT, &duration, "duration"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 7c8d43add..0238b82e6 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -25,10 +25,11 @@ static void formatKey(const FFLocalIpOptions* options, FFLocalIpResult* ip, uint else { ffStrbufClear(key); - FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 4, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &ip->name, "name"}, {FF_FORMAT_ARG_TYPE_STRBUF, &ip->mac, "mac"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } } diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 874346887..d83e3431e 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -41,9 +41,10 @@ void ffPrintMonitor(FFMonitorOptions* options) else { uint32_t moduleIndex = result.length == 1 ? 0 : index + 1; - FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &display->name, "name"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 1b3179915..5e762454e 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -25,9 +25,10 @@ static void formatKey(const FFNetIOOptions* options, FFNetIOResult* inf, uint32_ else { ffStrbufClear(key); - FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 2, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &inf->name, "name"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } } diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index e6695d1f9..10149ae65 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -23,10 +23,11 @@ static void formatKey(const FFPhysicalDiskOptions* options, FFPhysicalDiskResult else { ffStrbufClear(key); - FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){ + FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 4, ((FFformatarg[]){ {FF_FORMAT_ARG_TYPE_UINT, &index, "index"}, {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name, "name"}, {FF_FORMAT_ARG_TYPE_STRBUF, &dev->devPath, "dev-path"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &options->moduleArgs.keyIcon, "icon"}, })); } } diff --git a/src/modules/title/title.c b/src/modules/title/title.c index c3b0f575e..cf7c2fbff 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;