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

Modules: refactor module option handling for static allocation

Browse Source 
Moves module option structs out of global config and removes dynamic allocation, using static buffers and size assertions for safer, simpler management.

Refactors module initialization and destruction to work with isolated option structs, eliminating the need for the previous modules container and related code.

Unifies module option header usage and updates detection logic to leverage statically-sized option buffers, improving encapsulation and maintainability.

Simplifies module function signatures and reduces coupling between modules and config.

Enhances future extensibility and reliability by enforcing max size constraints and removing unnecessary indirections.
This commit is contained in:
李通洲
2025-08-04 14:25:14 +08:00
parent 559082806b
commit 75d2c668d0
289 changed files with 1449 additions and 1672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/flashfetch.c
+126 -43
View File
@@ -3,55 +3,138 @@
#include "common/init.h"
#include "modules/modules.h"
// A dirty replicate of neofetch
int main(void)
{
ffInitInstance(); //This also applies default configuration to instance.config
ffInitInstance(); // Init everything
//Modify instance.config here
FFOptionsModules* const options = &instance.config.modules;
// Modify global config here if needed
instance.config.display.sizeMaxPrefix = 2; // MB
instance.config.display.sizeNdigits = 2;
instance.config.display.freqNdigits = 3;
instance.config.display.freqSpaceBeforeUnit = FF_SPACE_BEFORE_UNIT_NEVER;
instance.config.display.sizeSpaceBeforeUnit = FF_SPACE_BEFORE_UNIT_NEVER;
// ffPrepareCPUUsage();
// ffPreparePublicIp(&options->publicIP);
// ffPrepareWeather(&options->weather);
//Does things like starting detection threads, disabling line wrap, etc
// Logo printing and other preparation stuff
ffStart();
//Printing
void* const modules[] = {
&options->title,
&options->separator,
&options->os,
&options->host,
&options->kernel,
&options->uptime,
&options->packages,
&options->shell,
&options->display,
&options->de,
&options->wm,
&options->wmTheme,
&options->theme,
&options->icons,
&options->font,
&options->cursor,
&options->terminal,
&options->terminalFont,
&options->cpu,
&options->gpu,
&options->memory,
&options->swap,
&options->disk,
&options->localIP,
&options->battery,
&options->powerAdapter,
&options->locale,
&options->break_,
&options->colors,
};
for (size_t i = 0; i < ARRAY_SIZE(modules); i++)
((const FFModuleBaseInfo*) modules[i])->printModule(modules[i]);
// Print all modules
{
__attribute__((cleanup(ffDestroyTitleOptions))) FFTitleOptions options;
ffInitTitleOptions(&options);
ffPrintTitle(&options);
}
{
__attribute__((cleanup(ffDestroySeparatorOptions))) FFSeparatorOptions options;
ffInitSeparatorOptions(&options);
ffPrintSeparator(&options);
}
{
__attribute__((cleanup(ffDestroyOSOptions))) FFOSOptions options;
ffInitOSOptions(&options);
ffPrintOS(&options);
}
{
__attribute__((cleanup(ffDestroyHostOptions))) FFHostOptions options;
ffInitHostOptions(&options);
ffPrintHost(&options);
}
{
__attribute__((cleanup(ffDestroyKernelOptions))) FFKernelOptions options;
ffInitKernelOptions(&options);
ffStrbufSetStatic(&options.moduleArgs.outputFormat, "{release}");
ffPrintKernel(&options);
}
{
__attribute__((cleanup(ffDestroyUptimeOptions))) FFUptimeOptions options;
ffInitUptimeOptions(&options);
ffPrintUptime(&options);
}
{
__attribute__((cleanup(ffDestroyPackagesOptions))) FFPackagesOptions options;
ffInitPackagesOptions(&options);
options.combined = true;
ffPrintPackages(&options);
}
{
__attribute__((cleanup(ffDestroyShellOptions))) FFShellOptions options;
ffInitShellOptions(&options);
ffPrintShell(&options);
}
{
__attribute__((cleanup(ffDestroyDisplayOptions))) FFDisplayOptions options;
ffInitDisplayOptions(&options);
options.compactType = FF_DISPLAY_COMPACT_TYPE_ORIGINAL_BIT;
ffStrbufSetStatic(&options.moduleArgs.key, "Resolution");
ffPrintDisplay(&options);
}
{
__attribute__((cleanup(ffDestroyDEOptions))) FFDEOptions options;
ffInitDEOptions(&options);
ffPrintDE(&options);
}
{
instance.config.general.detectVersion = false;
__attribute__((cleanup(ffDestroyWMOptions))) FFWMOptions options;
ffInitWMOptions(&options);
options.detectPlugin = true;
ffPrintWM(&options);
instance.config.general.detectVersion = true;
}
{
__attribute__((cleanup(ffDestroyWMThemeOptions))) FFWMThemeOptions options;
ffInitWMThemeOptions(&options);
ffPrintWMTheme(&options);
}
{
__attribute__((cleanup(ffDestroyThemeOptions))) FFThemeOptions options;
ffInitThemeOptions(&options);
ffPrintTheme(&options);
}
{
__attribute__((cleanup(ffDestroyIconsOptions))) FFIconsOptions options;
ffInitIconsOptions(&options);
ffPrintIcons(&options);
}
{
__attribute__((cleanup(ffDestroyTerminalOptions))) FFTerminalOptions options;
ffInitTerminalOptions(&options);
ffPrintTerminal(&options);
}
{
__attribute__((cleanup(ffDestroyTerminalFontOptions))) FFTerminalFontOptions options;
ffInitTerminalFontOptions(&options);
ffStrbufSetStatic(&options.moduleArgs.outputFormat, "{/name}{-}{/}{name}{?size} {size}{?}");
ffPrintTerminalFont(&options);
}
{
__attribute__((cleanup(ffDestroyCPUOptions))) FFCPUOptions options;
ffInitCPUOptions(&options);
ffPrintCPU(&options);
}
{
__attribute__((cleanup(ffDestroyGPUOptions))) FFGPUOptions options;
ffInitGPUOptions(&options);
ffStrbufSetStatic(&options.moduleArgs.key, "GPU");
ffStrbufSetStatic(&options.moduleArgs.outputFormat, "{name}");
ffPrintGPU(&options);
}
{
__attribute__((cleanup(ffDestroyMemoryOptions))) FFMemoryOptions options;
ffInitMemoryOptions(&options);
ffStrbufSetStatic(&options.moduleArgs.outputFormat, "{} / {}");
ffPrintMemory(&options);
}
{
__attribute__((cleanup(ffDestroyBreakOptions))) FFBreakOptions options;
ffInitBreakOptions(&options);
ffPrintBreak(&options);
}
{
__attribute__((cleanup(ffDestroyColorsOptions))) FFColorsOptions options;
ffInitColorsOptions(&options);
ffPrintColors(&options);
}
ffFinish();
ffDestroyInstance();