diff --git a/CMakeLists.txt b/CMakeLists.txt index 09ed83552..23fa855f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ file(GLOB FF_MODULE_DIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src/modules" "${C foreach(FF_MODULE_DIR ${FF_MODULE_DIRS}) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/modules/${FF_MODULE_DIR}") string(TOUPPER "${FF_MODULE_DIR}" FF_MODULE_UPPER) - option(DISABLE_MODULE_${FF_MODULE_UPPER} "Disable module ${FF_MODULE_DIR}" OFF) + option(MODULE_DISABLE_${FF_MODULE_UPPER} "Disable module ${FF_MODULE_DIR}" OFF) endif() endforeach() @@ -1395,8 +1395,8 @@ add_library(libfastfetch OBJECT foreach(FF_MODULE_DIR ${FF_MODULE_DIRS}) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/modules/${FF_MODULE_DIR}") string(TOUPPER "${FF_MODULE_DIR}" FF_MODULE_UPPER) - if(DISABLE_MODULE_${FF_MODULE_UPPER}) - target_compile_definitions(libfastfetch PUBLIC FF_DISABLE_MODULE_${FF_MODULE_UPPER}=1) + if(MODULE_DISABLE_${FF_MODULE_UPPER}) + target_compile_definitions(libfastfetch PUBLIC FF_MODULE_DISABLE_${FF_MODULE_UPPER}=1) endif() endif() endforeach() diff --git a/src/common/impl/commandoption.c b/src/common/impl/commandoption.c index 9cedd2a60..2f548dfad 100644 --- a/src/common/impl/commandoption.c +++ b/src/common/impl/commandoption.c @@ -70,7 +70,7 @@ void ffPrepareCommandOption(FFdata* data) { #define FF_IF_MODULE_MATCH(moduleNameConstant) if (moduleLen == strlen(moduleNameConstant) && ffStrEqualsIgnCase(moduleType, moduleNameConstant) && !ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleNameConstant, ':')) switch (moduleType[0]) { - #if !FF_DISABLE_MODULE_CPUUSAGE + #if !FF_MODULE_DISABLE_CPUUSAGE case 'C': case 'c': FF_IF_MODULE_MATCH(FF_CPUUSAGE_MODULE_NAME) @@ -78,7 +78,7 @@ void ffPrepareCommandOption(FFdata* data) { break; #endif - #if !FF_DISABLE_MODULE_DISKIO + #if !FF_MODULE_DISABLE_DISKIO case 'D': case 'd': FF_IF_MODULE_MATCH(FF_DISKIO_MODULE_NAME) { @@ -89,7 +89,7 @@ void ffPrepareCommandOption(FFdata* data) { break; #endif - #if !FF_DISABLE_MODULE_NETIO + #if !FF_MODULE_DISABLE_NETIO case 'N': case 'n': FF_IF_MODULE_MATCH(FF_NETIO_MODULE_NAME) { @@ -100,7 +100,7 @@ void ffPrepareCommandOption(FFdata* data) { break; #endif - #if !FF_DISABLE_MODULE_PUBLICIP + #if !FF_MODULE_DISABLE_PUBLICIP case 'P': case 'p': FF_IF_MODULE_MATCH(FF_PUBLICIP_MODULE_NAME) { @@ -111,7 +111,7 @@ void ffPrepareCommandOption(FFdata* data) { break; #endif - #if !FF_DISABLE_MODULE_WEATHER + #if !FF_MODULE_DISABLE_WEATHER case 'W': case 'w': FF_IF_MODULE_MATCH(FF_WEATHER_MODULE_NAME) { diff --git a/src/common/impl/init.c b/src/common/impl/init.c index 2170e32a4..fa034b27a 100644 --- a/src/common/impl/init.c +++ b/src/common/impl/init.c @@ -29,7 +29,7 @@ static void initState(FFstate* state) { ffPlatformInit(&state->platform); state->dynamicInterval = 0; - #if !FF_DISABLE_MODULE_TERMINALTHEME + #if !FF_MODULE_DISABLE_TERMINALTHEME { // don't enable bright color if the terminal is in light mode FFTerminalThemeResult result; diff --git a/src/common/impl/jsonconfig.c b/src/common/impl/jsonconfig.c index f7cea5eb4..fccc56cc0 100644 --- a/src/common/impl/jsonconfig.c +++ b/src/common/impl/jsonconfig.c @@ -133,7 +133,7 @@ static bool parseModuleJsonObject(const char* type, yyjson_val* jsonVal, yyjson_ static void prepareModuleJsonObject(const char* type, yyjson_val* module) { switch (type[0]) { - #if !FF_DISABLE_MODULE_CPUUSAGE + #if !FF_MODULE_DISABLE_CPUUSAGE case 'c': case 'C': { if (ffStrEqualsIgnCase(type, FF_CPUUSAGE_MODULE_NAME)) { @@ -150,7 +150,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) { } #endif - #if !FF_DISABLE_MODULE_DISKIO + #if !FF_MODULE_DISABLE_DISKIO case 'd': case 'D': { if (ffStrEqualsIgnCase(type, FF_DISKIO_MODULE_NAME)) { @@ -165,7 +165,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) { } #endif - #if !FF_DISABLE_MODULE_NETIO + #if !FF_MODULE_DISABLE_NETIO case 'n': case 'N': { if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME)) { @@ -180,7 +180,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) { } #endif - #if !FF_DISABLE_MODULE_PUBLICIP + #if !FF_MODULE_DISABLE_PUBLICIP case 'p': case 'P': { if (ffStrEqualsIgnCase(type, FF_PUBLICIP_MODULE_NAME)) { @@ -195,7 +195,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) { } #endif - #if !FF_DISABLE_MODULE_WEATHER + #if !FF_MODULE_DISABLE_WEATHER case 'w': case 'W': { if (ffStrEqualsIgnCase(type, FF_WEATHER_MODULE_NAME)) { diff --git a/src/detection/media/media_apple.m b/src/detection/media/media_apple.m index 2f9f3928a..d9501d1fb 100644 --- a/src/detection/media/media_apple.m +++ b/src/detection/media/media_apple.m @@ -110,7 +110,7 @@ static const char* getMediaByMediaRemote(FFMediaResult* result, bool saveCover) return error; } -#if !FF_DISABLE_MODULE_MEDIA +#if !FF_MODULE_DISABLE_MEDIA __attribute__((visibility("default"), used)) int ffPrintMediaByMediaRemote(bool saveCover) { FFMediaResult media = { diff --git a/src/logo/logo.c b/src/logo/logo.c index fbbc66a69..9f2c89244 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -461,7 +461,7 @@ static bool updateLogoPath(void) { return true; } - #if !FF_DISABLE_MODULE_MEDIA + #if !FF_MODULE_DISABLE_MEDIA if (ffStrbufIgnCaseEqualS(&options->source, "media-cover")) { const FFMediaResult* media = ffDetectMedia(true); if (media->cover.length == 0) { @@ -639,7 +639,7 @@ void ffLogoPrint(void) { } if (!ffStrbufEndsWithIgnCaseS(&options->source, ".txt")) { - #if !FF_DISABLE_MODULE_TERMINAL + #if !FF_MODULE_DISABLE_TERMINAL const FFTerminalResult* terminal = ffDetectTerminal(); bool supportsIterm2 = ffStrbufEqualS(&terminal->prettyName, "iTerm"); diff --git a/src/modules/modules.c b/src/modules/modules.c index 4f6ac3bfd..2139ec7a3 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -1,7 +1,7 @@ #include "modules/modules.h" // Note: -// FF_DISABLE_MODULE_ only controls if the module is registered, +// FF_MODULE_DISABLE_ only controls if the module is registered, // the module code itself is still compiled. // We rely `LTO` to remove the unused code (only enabled in Release mode) @@ -10,125 +10,125 @@ static FFModuleBaseInfo* A[] = { }; static FFModuleBaseInfo* B[] = { -#if !FF_DISABLE_MODULE_BATTERY +#if !FF_MODULE_DISABLE_BATTERY &ffBatteryModuleInfo, #endif -#if !FF_DISABLE_MODULE_BIOS +#if !FF_MODULE_DISABLE_BIOS &ffBiosModuleInfo, #endif -#if !FF_DISABLE_MODULE_BLUETOOTH +#if !FF_MODULE_DISABLE_BLUETOOTH &ffBluetoothModuleInfo, #endif -#if !FF_DISABLE_MODULE_BLUETOOTHRADIO +#if !FF_MODULE_DISABLE_BLUETOOTHRADIO &ffBluetoothRadioModuleInfo, #endif -#if !FF_DISABLE_MODULE_BOARD +#if !FF_MODULE_DISABLE_BOARD &ffBoardModuleInfo, #endif -#if !FF_DISABLE_MODULE_BOOTMGR +#if !FF_MODULE_DISABLE_BOOTMGR &ffBootmgrModuleInfo, #endif -#if !FF_DISABLE_MODULE_BREAK +#if !FF_MODULE_DISABLE_BREAK &ffBreakModuleInfo, #endif -#if !FF_DISABLE_MODULE_BRIGHTNESS +#if !FF_MODULE_DISABLE_BRIGHTNESS &ffBrightnessModuleInfo, #endif -#if !FF_DISABLE_MODULE_BTRFS +#if !FF_MODULE_DISABLE_BTRFS &ffBtrfsModuleInfo, #endif NULL, }; static FFModuleBaseInfo* C[] = { -#if !FF_DISABLE_MODULE_CAMERA +#if !FF_MODULE_DISABLE_CAMERA &ffCameraModuleInfo, #endif -#if !FF_DISABLE_MODULE_CHASSIS +#if !FF_MODULE_DISABLE_CHASSIS &ffChassisModuleInfo, #endif -#if !FF_DISABLE_MODULE_COMMAND +#if !FF_MODULE_DISABLE_COMMAND &ffCommandModuleInfo, #endif -#if !FF_DISABLE_MODULE_COLORS +#if !FF_MODULE_DISABLE_COLORS &ffColorsModuleInfo, #endif -#if !FF_DISABLE_MODULE_CPU +#if !FF_MODULE_DISABLE_CPU &ffCPUModuleInfo, #endif -#if !FF_DISABLE_MODULE_CPUCACHE +#if !FF_MODULE_DISABLE_CPUCACHE &ffCPUCacheModuleInfo, #endif -#if !FF_DISABLE_MODULE_CPUUSAGE +#if !FF_MODULE_DISABLE_CPUUSAGE &ffCPUUsageModuleInfo, #endif -#if !FF_DISABLE_MODULE_CURSOR +#if !FF_MODULE_DISABLE_CURSOR &ffCursorModuleInfo, #endif -#if !FF_DISABLE_MODULE_CUSTOM +#if !FF_MODULE_DISABLE_CUSTOM &ffCustomModuleInfo, #endif NULL, }; static FFModuleBaseInfo* D[] = { -#if !FF_DISABLE_MODULE_DATETIME +#if !FF_MODULE_DISABLE_DATETIME &ffDateTimeModuleInfo, #endif -#if !FF_DISABLE_MODULE_DE +#if !FF_MODULE_DISABLE_DE &ffDEModuleInfo, #endif -#if !FF_DISABLE_MODULE_DISPLAY +#if !FF_MODULE_DISABLE_DISPLAY &ffDisplayModuleInfo, #endif -#if !FF_DISABLE_MODULE_DISK +#if !FF_MODULE_DISABLE_DISK &ffDiskModuleInfo, #endif -#if !FF_DISABLE_MODULE_DISKIO +#if !FF_MODULE_DISABLE_DISKIO &ffDiskIOModuleInfo, #endif -#if !FF_DISABLE_MODULE_DNS +#if !FF_MODULE_DISABLE_DNS &ffDNSModuleInfo, #endif NULL, }; static FFModuleBaseInfo* E[] = { -#if !FF_DISABLE_MODULE_EDITOR +#if !FF_MODULE_DISABLE_EDITOR &ffEditorModuleInfo, #endif NULL, }; static FFModuleBaseInfo* F[] = { -#if !FF_DISABLE_MODULE_FONT +#if !FF_MODULE_DISABLE_FONT &ffFontModuleInfo, #endif NULL, }; static FFModuleBaseInfo* G[] = { -#if !FF_DISABLE_MODULE_GAMEPAD +#if !FF_MODULE_DISABLE_GAMEPAD &ffGamepadModuleInfo, #endif -#if !FF_DISABLE_MODULE_GPU +#if !FF_MODULE_DISABLE_GPU &ffGPUModuleInfo, #endif NULL, }; static FFModuleBaseInfo* H[] = { -#if !FF_DISABLE_MODULE_HOST +#if !FF_MODULE_DISABLE_HOST &ffHostModuleInfo, #endif NULL, }; static FFModuleBaseInfo* I[] = { -#if !FF_DISABLE_MODULE_ICONS +#if !FF_MODULE_DISABLE_ICONS &ffIconsModuleInfo, #endif -#if !FF_DISABLE_MODULE_INITSYSTEM +#if !FF_MODULE_DISABLE_INITSYSTEM &ffInitSystemModuleInfo, #endif NULL, @@ -139,90 +139,90 @@ static FFModuleBaseInfo* J[] = { }; static FFModuleBaseInfo* K[] = { -#if !FF_DISABLE_MODULE_KERNEL +#if !FF_MODULE_DISABLE_KERNEL &ffKernelModuleInfo, #endif -#if !FF_DISABLE_MODULE_KEYBOARD +#if !FF_MODULE_DISABLE_KEYBOARD &ffKeyboardModuleInfo, #endif NULL, }; static FFModuleBaseInfo* L[] = { -#if !FF_DISABLE_MODULE_LM +#if !FF_MODULE_DISABLE_LM &ffLMModuleInfo, #endif -#if !FF_DISABLE_MODULE_LOADAVG +#if !FF_MODULE_DISABLE_LOADAVG &ffLoadavgModuleInfo, #endif -#if !FF_DISABLE_MODULE_LOCALE +#if !FF_MODULE_DISABLE_LOCALE &ffLocaleModuleInfo, #endif -#if !FF_DISABLE_MODULE_LOCALIP +#if !FF_MODULE_DISABLE_LOCALIP &ffLocalIPModuleInfo, #endif -#if !FF_DISABLE_MODULE_LOGO +#if !FF_MODULE_DISABLE_LOGO &ffLogoModuleInfo, #endif NULL, }; static FFModuleBaseInfo* M[] = { -#if !FF_DISABLE_MODULE_MEDIA +#if !FF_MODULE_DISABLE_MEDIA &ffMediaModuleInfo, #endif -#if !FF_DISABLE_MODULE_MEMORY +#if !FF_MODULE_DISABLE_MEMORY &ffMemoryModuleInfo, #endif -#if !FF_DISABLE_MODULE_MONITOR +#if !FF_MODULE_DISABLE_MONITOR &ffMonitorModuleInfo, #endif -#if !FF_DISABLE_MODULE_MOUSE +#if !FF_MODULE_DISABLE_MOUSE &ffMouseModuleInfo, #endif NULL, }; static FFModuleBaseInfo* N[] = { -#if !FF_DISABLE_MODULE_NETIO +#if !FF_MODULE_DISABLE_NETIO &ffNetIOModuleInfo, #endif NULL, }; static FFModuleBaseInfo* O[] = { -#if !FF_DISABLE_MODULE_OPENCL +#if !FF_MODULE_DISABLE_OPENCL &ffOpenCLModuleInfo, #endif -#if !FF_DISABLE_MODULE_OPENGL +#if !FF_MODULE_DISABLE_OPENGL &ffOpenGLModuleInfo, #endif -#if !FF_DISABLE_MODULE_OS +#if !FF_MODULE_DISABLE_OS &ffOSModuleInfo, #endif NULL, }; static FFModuleBaseInfo* P[] = { -#if !FF_DISABLE_MODULE_PACKAGES +#if !FF_MODULE_DISABLE_PACKAGES &ffPackagesModuleInfo, #endif -#if !FF_DISABLE_MODULE_PHYSICALDISK +#if !FF_MODULE_DISABLE_PHYSICALDISK &ffPhysicalDiskModuleInfo, #endif -#if !FF_DISABLE_MODULE_PHYSICALMEMORY +#if !FF_MODULE_DISABLE_PHYSICALMEMORY &ffPhysicalMemoryModuleInfo, #endif -#if !FF_DISABLE_MODULE_PLAYER +#if !FF_MODULE_DISABLE_PLAYER &ffPlayerModuleInfo, #endif -#if !FF_DISABLE_MODULE_POWERADAPTER +#if !FF_MODULE_DISABLE_POWERADAPTER &ffPowerAdapterModuleInfo, #endif -#if !FF_DISABLE_MODULE_PROCESSES +#if !FF_MODULE_DISABLE_PROCESSES &ffProcessesModuleInfo, #endif -#if !FF_DISABLE_MODULE_PUBLICIP +#if !FF_MODULE_DISABLE_PUBLICIP &ffPublicIPModuleInfo, #endif NULL, @@ -237,80 +237,80 @@ static FFModuleBaseInfo* R[] = { }; static FFModuleBaseInfo* S[] = { -#if !FF_DISABLE_MODULE_SEPARATOR +#if !FF_MODULE_DISABLE_SEPARATOR &ffSeparatorModuleInfo, #endif -#if !FF_DISABLE_MODULE_SHELL +#if !FF_MODULE_DISABLE_SHELL &ffShellModuleInfo, #endif -#if !FF_DISABLE_MODULE_SOUND +#if !FF_MODULE_DISABLE_SOUND &ffSoundModuleInfo, #endif -#if !FF_DISABLE_MODULE_SWAP +#if !FF_MODULE_DISABLE_SWAP &ffSwapModuleInfo, #endif NULL, }; static FFModuleBaseInfo* T[] = { -#if !FF_DISABLE_MODULE_TERMINAL +#if !FF_MODULE_DISABLE_TERMINAL &ffTerminalModuleInfo, #endif -#if !FF_DISABLE_MODULE_TERMINALFONT +#if !FF_MODULE_DISABLE_TERMINALFONT &ffTerminalFontModuleInfo, #endif -#if !FF_DISABLE_MODULE_TERMINALSIZE +#if !FF_MODULE_DISABLE_TERMINALSIZE &ffTerminalSizeModuleInfo, #endif -#if !FF_DISABLE_MODULE_TERMINALTHEME +#if !FF_MODULE_DISABLE_TERMINALTHEME &ffTerminalThemeModuleInfo, #endif -#if !FF_DISABLE_MODULE_TITLE +#if !FF_MODULE_DISABLE_TITLE &ffTitleModuleInfo, #endif -#if !FF_DISABLE_MODULE_THEME +#if !FF_MODULE_DISABLE_THEME &ffThemeModuleInfo, #endif -#if !FF_DISABLE_MODULE_TPM +#if !FF_MODULE_DISABLE_TPM &ffTPMModuleInfo, #endif NULL, }; static FFModuleBaseInfo* U[] = { -#if !FF_DISABLE_MODULE_UPTIME +#if !FF_MODULE_DISABLE_UPTIME &ffUptimeModuleInfo, #endif -#if !FF_DISABLE_MODULE_USERS +#if !FF_MODULE_DISABLE_USERS &ffUsersModuleInfo, #endif NULL, }; static FFModuleBaseInfo* V[] = { -#if !FF_DISABLE_MODULE_VERSION +#if !FF_MODULE_DISABLE_VERSION &ffVersionModuleInfo, #endif -#if !FF_DISABLE_MODULE_VULKAN +#if !FF_MODULE_DISABLE_VULKAN &ffVulkanModuleInfo, #endif NULL, }; static FFModuleBaseInfo* W[] = { -#if !FF_DISABLE_MODULE_WALLPAPER +#if !FF_MODULE_DISABLE_WALLPAPER &ffWallpaperModuleInfo, #endif -#if !FF_DISABLE_MODULE_WEATHER +#if !FF_MODULE_DISABLE_WEATHER &ffWeatherModuleInfo, #endif -#if !FF_DISABLE_MODULE_WM +#if !FF_MODULE_DISABLE_WM &ffWMModuleInfo, #endif -#if !FF_DISABLE_MODULE_WIFI +#if !FF_MODULE_DISABLE_WIFI &ffWifiModuleInfo, #endif -#if !FF_DISABLE_MODULE_WMTHEME +#if !FF_MODULE_DISABLE_WMTHEME &ffWMThemeModuleInfo, #endif NULL, @@ -325,7 +325,7 @@ static FFModuleBaseInfo* Y[] = { }; static FFModuleBaseInfo* Z[] = { -#if !FF_DISABLE_MODULE_ZPOOL +#if !FF_MODULE_DISABLE_ZPOOL &ffZpoolModuleInfo, #endif NULL,