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

Global: make FFinstance instance a global variable

Browse Source 
As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/wmtheme/wmtheme.c
+8 -8
View File
@@ -7,26 +7,26 @@
#define FF_WMTHEME_DISPLAY_NAME "WM Theme"
#define FF_WMTHEME_NUM_FORMAT_ARGS 1
void ffPrintWMTheme(FFinstance* instance, FFWMThemeOptions* options)
void ffPrintWMTheme(FFWMThemeOptions* options)
{
FF_STRBUF_AUTO_DESTROY themeOrError = ffStrbufCreate();
if(ffDetectWmTheme(instance, &themeOrError))
if(ffDetectWmTheme(&themeOrError))
{
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
ffPrintLogoAndKey(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
puts(themeOrError.chars);
}
else
{
ffPrintFormat(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_WMTHEME_NUM_FORMAT_ARGS, (FFformatarg[]){
ffPrintFormat(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_WMTHEME_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &themeOrError}
});
}
}
else
{
ffPrintError(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, "%*s", themeOrError.length, themeOrError.chars);
ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, "%*s", themeOrError.length, themeOrError.chars);
}
}
@@ -51,7 +51,7 @@ void ffDestroyWMThemeOptions(FFWMThemeOptions* options)
ffOptionDestroyModuleArg(&options->moduleArgs);
}
void ffParseWMThemeJsonObject(FFinstance* instance, yyjson_val* module)
void ffParseWMThemeJsonObject(yyjson_val* module)
{
FFWMThemeOptions __attribute__((__cleanup__(ffDestroyWMThemeOptions))) options;
ffInitWMThemeOptions(&options);
@@ -69,9 +69,9 @@ void ffParseWMThemeJsonObject(FFinstance* instance, yyjson_val* module)
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_WMTHEME_DISPLAY_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintWMTheme(instance, &options);
ffPrintWMTheme(&options);
}
src/modules/wmtheme/wmtheme.h
+2 -2
View File
@@ -4,8 +4,8 @@
#define FF_WMTHEME_MODULE_NAME "WMTheme"
void ffPrintWMTheme(FFinstance* instance, FFWMThemeOptions* options);
void ffPrintWMTheme(FFWMThemeOptions* options);
void ffInitWMThemeOptions(FFWMThemeOptions* options);
bool ffParseWMThemeCommandOptions(FFWMThemeOptions* options, const char* key, const char* value);
void ffDestroyWMThemeOptions(FFWMThemeOptions* options);
void ffParseWMThemeJsonObject(FFinstance* instance, yyjson_val* module);
void ffParseWMThemeJsonObject(yyjson_val* module);