fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 00:03:58 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: refactor code of -h <module>-format

Browse Source
This commit is contained in:
李通洲
2024-12-11 10:47:02 +08:00
parent e45ff546ed
commit 9a36d63d18
78 changed files with 1454 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/wm/wm.c
+17 -23
View File
@@ -5,8 +5,6 @@
#include "modules/wm/wm.h"
#include "util/stringUtils.h"
#define FF_WM_NUM_FORMAT_ARGS 4
void ffPrintWM(FFWMOptions* options)
{
const FFDisplayServerResult* result = ffConnectDisplayServer();
@@ -45,7 +43,7 @@ void ffPrintWM(FFWMOptions* options)
}
else
{
FF_PRINT_FORMAT_CHECKED(FF_WM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_WM_NUM_FORMAT_ARGS, ((FFformatarg[]){
FF_PRINT_FORMAT_CHECKED(FF_WM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
FF_FORMAT_ARG(result->wmProcessName, "process-name"),
FF_FORMAT_ARG(result->wmPrettyName, "pretty-name"),
FF_FORMAT_ARG(result->wmProtocolName, "protocol-name"),
@@ -125,29 +123,25 @@ void ffGenerateWMJsonResult(FF_MAYBE_UNUSED FFWMOptions* options, yyjson_mut_doc
yyjson_mut_obj_add_strbuf(doc, obj, "pluginName", &pluginName);
}
void ffPrintWMHelpFormat(void)
{
FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_WM_MODULE_NAME, "{2} ({3})", FF_WM_NUM_FORMAT_ARGS, ((const char* []) {
"WM process name - process-name",
"WM pretty name - pretty-name",
"WM protocol name - protocol-name",
"WM plugin name - plugin-name",
}));
}
static FFModuleBaseInfo ffModuleInfo = {
.name = FF_WM_MODULE_NAME,
.description = "Print window manager name and version",
.parseCommandOptions = (void*) ffParseWMCommandOptions,
.parseJsonObject = (void*) ffParseWMJsonObject,
.printModule = (void*) ffPrintWM,
.generateJsonResult = (void*) ffGenerateWMJsonResult,
.generateJsonConfig = (void*) ffGenerateWMJsonConfig,
.formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
{"WM process name", "process-name"},
{"WM pretty name", "pretty-name"},
{"WM protocol name", "protocol-name"},
{"WM plugin name", "plugin-name"},
}))
};
void ffInitWMOptions(FFWMOptions* options)
{
ffOptionInitModuleBaseInfo(
&options->moduleInfo,
FF_WM_MODULE_NAME,
"Print window manager name and version",
ffParseWMCommandOptions,
ffParseWMJsonObject,
ffPrintWM,
ffGenerateWMJsonResult,
ffPrintWMHelpFormat,
ffGenerateWMJsonConfig
);
options->moduleInfo = ffModuleInfo;
ffOptionInitModuleArg(&options->moduleArgs, "");
options->detectPlugin = false;
}