diff --git a/src/common/impl/printing.c b/src/common/impl/printing.c index 1203dfb0a..832c6301c 100644 --- a/src/common/impl/printing.c +++ b/src/common/impl/printing.c @@ -47,6 +47,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, ((FFformatarg[]) { FF_ARG(moduleIndex, "index"), FF_ARG(moduleArgs->keyIcon, "icon"), + FF_ARG(moduleName, "module-name"), })); ffStrbufWriteTo(&key, stdout); } diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 33e969436..f1faa0a79 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -21,6 +21,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin FF_ARG(index, "index"), FF_ARG(result->modelName, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Battery), "module-name"), })); } diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index fc4f7ac73..55a6e03f0 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -40,6 +40,7 @@ bool ffPrintBios(FFBiosOptions* options) { FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) { FF_ARG(bios.type, "type"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Bios), "module-name"), })); } diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index 0596fb47e..63c27fdda 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -22,6 +22,7 @@ static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadio FF_ARG(index, "index"), FF_ARG(radio->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), "module-name"), })); } diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 5c6fc1544..2bfe4d802 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -51,6 +51,7 @@ bool ffPrintBrightness(FFBrightnessOptions* options) { FF_ARG(moduleIndex, "index"), FF_ARG(item->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Brightness), "module-name"), })); } diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index 052cf32dc..345f7927e 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -20,6 +20,7 @@ static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t i FF_ARG(index, "index"), FF_ARG(result->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Btrfs), "module-name"), })); } diff --git a/src/modules/codec/codec.c b/src/modules/codec/codec.c index 2e5b87983..629444805 100644 --- a/src/modules/codec/codec.c +++ b/src/modules/codec/codec.c @@ -61,6 +61,7 @@ static void printCodecLine(const FFCodecOptions* options, uint8_t index, FFstrbu FF_ARG(*gpu, "gpu"), FF_ARG(direction, "direction"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Codec), "module-name"), })); } diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index efb9407e4..d4c9cee5d 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -21,6 +21,7 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption FF_ARG(index, "index"), FF_ARG(levelStr, "level"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(CPUCache), "module-name"), })); } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index da6fe9fab..b87105471 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -45,6 +45,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index FF_ARG(disk->filesystem, "filesystem"), FF_ARG(mountpointLink, "mountpoint-link"), FF_ARG(nameLink, "name-link"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Disk), "module-name"), })); } diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 61ed83001..c052983f5 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -19,6 +19,7 @@ static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint3 FF_ARG(dev->name, "name"), FF_ARG(dev->devPath, "dev-path"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(DiskIO), "module-name"), })); } } diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 8d169d7db..f3ba4d75a 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -83,6 +83,7 @@ bool ffPrintDisplay(FFDisplayOptions* options) { FF_ARG(result->name, "name"), FF_ARG(displayType, "type"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Display), "module-name"), })); } diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 40aa8115b..f737f84dd 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -41,6 +41,7 @@ bool ffPrintLoadavg(FFLoadavgOptions* options) { FF_ARG(index, "index"), FF_ARG(duration, "duration"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Loadavg), "module-name"), })); } diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index c1c53be23..c817c7ac9 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -24,6 +24,7 @@ static void formatKey(const FFLocalIpOptions* options, FFLocalIpResult* ip, uint FF_ARG(ip->name, "ifname"), FF_ARG(ip->mac, "mac"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(LocalIP), "module-name"), })); } } diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index b5ac69f69..ab53af918 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -33,6 +33,7 @@ bool ffPrintMonitor(FFMonitorOptions* options) { FF_ARG(moduleIndex, "index"), FF_ARG(display->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Monitor), "module-name"), })); } diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 0ffe4f1d3..69de01058 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -22,6 +22,7 @@ static void formatKey(const FFNetIOOptions* options, FFNetIOResult* inf, uint32_ FF_ARG(index, "index"), FF_ARG(inf->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(NetIO), "module-name"), })); } } diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 12dd2740a..c8fa4987f 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -63,6 +63,7 @@ bool ffPrintOS(FFOSOptions* options) { FF_ARG(instance.state.platform.sysinfo.name, "sysname"), FF_ARG(os->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(OS), "module-name"), })); } diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index 3b396d1f7..0690f7222 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -19,6 +19,7 @@ static void formatKey(const FFPhysicalDiskOptions* options, FFPhysicalDiskResult FF_ARG(dev->name, "name"), FF_ARG(dev->devPath, "dev-path"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(PhysicalDisk), "module-name"), })); } } diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 7fe8b900b..b1cc38321 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -21,6 +21,7 @@ void printSwap(FFSwapOptions* options, uint8_t index, uint32_t totalCount, FFSwa FF_ARG(index, "index"), FF_ARG(storage->name, "name"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Swap), "module-name"), })); } diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index c974f9630..dc3966824 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -22,6 +22,7 @@ static void printZpool(FFZpoolOptions* options, FFZpoolResult* result, uint8_t i FF_ARG(result->name, "name"), FF_ARG(result->guid, "guid"), FF_ARG(options->moduleArgs.keyIcon, "icon"), + FF_ARG(FF_MODULE_GET_DISPLAY_NAME(Zpool), "module-name"), })); }