From 79651073479bc944f2f38cde5d172fbbb5965b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 9 Aug 2023 16:31:24 +0800 Subject: [PATCH] PhysicalDisplay: rename module to Monitor --- CMakeLists.txt | 12 +++--- README.md | 2 +- doc/json_schema.json | 4 +- src/common/jsonconfig.c | 7 +-- src/data/config_user.txt | 6 +-- .../physicaldisplay.h => monitor/monitor.h} | 6 +-- .../monitor_apple.c} | 20 ++++----- .../monitor_linux.c} | 6 +-- src/detection/monitor/monitor_nosupport.c | 6 +++ .../monitor_windows.c} | 6 +-- .../physicaldisplay_nosupport.c | 6 --- src/fastfetch.c | 30 ++++++------- src/fastfetch.h | 2 +- src/modules/modules.h | 2 +- .../physicaldisplay.c => monitor/monitor.c} | 43 +++++++++---------- src/modules/monitor/monitor.h | 11 +++++ .../{physicaldisplay => monitor}/option.h | 4 +- src/modules/options.h | 2 +- src/modules/physicaldisplay/physicaldisplay.h | 11 ----- 19 files changed, 90 insertions(+), 96 deletions(-) rename src/detection/{physicaldisplay/physicaldisplay.h => monitor/monitor.h} (67%) rename src/detection/{physicaldisplay/physicaldisplay_apple.c => monitor/monitor_apple.c} (85%) rename src/detection/{physicaldisplay/physicaldisplay_linux.c => monitor/monitor_linux.c} (90%) create mode 100644 src/detection/monitor/monitor_nosupport.c rename src/detection/{physicaldisplay/physicaldisplay_windows.c => monitor/monitor_windows.c} (89%) delete mode 100644 src/detection/physicaldisplay/physicaldisplay_nosupport.c rename src/modules/{physicaldisplay/physicaldisplay.c => monitor/monitor.c} (59%) create mode 100644 src/modules/monitor/monitor.h rename src/modules/{physicaldisplay => monitor}/option.h (73%) delete mode 100644 src/modules/physicaldisplay/physicaldisplay.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b658f410..423f1df40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,7 @@ set(LIBFASTFETCH_SRC src/modules/locale/locale.c src/modules/localip/localip.c src/modules/memory/memory.c - src/modules/physicaldisplay/physicaldisplay.c + src/modules/monitor/monitor.c src/modules/opencl/opencl.c src/modules/opengl/opengl.c src/modules/os/os.c @@ -395,7 +395,7 @@ if(LINUX) src/detection/gamepad/gamepad_linux.c src/detection/media/media_linux.c src/detection/memory/memory_linux.c - src/detection/physicaldisplay/physicaldisplay_linux.c + src/detection/monitor/monitor_linux.c src/detection/opengl/opengl_linux.c src/detection/os/os_linux.c src/detection/packages/packages_linux.c @@ -441,7 +441,7 @@ elseif(ANDROID) src/detection/gamepad/gamepad_nosupport.c src/detection/media/media_nosupport.c src/detection/memory/memory_linux.c - src/detection/physicaldisplay/physicaldisplay_nosupport.c + src/detection/monitor/monitor_nosupport.c src/detection/opengl/opengl_linux.c src/detection/os/os_android.c src/detection/packages/packages_linux.c @@ -493,7 +493,7 @@ elseif(BSD) src/detection/gamepad/gamepad_bsd.c src/detection/media/media_linux.c src/detection/memory/memory_bsd.c - src/detection/physicaldisplay/physicaldisplay_nosupport.c + src/detection/monitor/monitor_nosupport.c src/detection/opengl/opengl_linux.c src/detection/os/os_linux.c src/detection/packages/packages_linux.c @@ -541,7 +541,7 @@ elseif(APPLE) src/detection/gamepad/gamepad_apple.c src/detection/media/media_apple.m src/detection/memory/memory_apple.c - src/detection/physicaldisplay/physicaldisplay_apple.c + src/detection/monitor/monitor_apple.c src/detection/opengl/opengl_apple.c src/detection/os/os_apple.m src/detection/packages/packages_apple.c @@ -588,7 +588,7 @@ elseif(WIN32) src/detection/gamepad/gamepad_windows.c src/detection/media/media_nosupport.c src/detection/memory/memory_windows.c - src/detection/physicaldisplay/physicaldisplay_windows.c + src/detection/monitor/monitor_windows.c src/detection/opengl/opengl_windows.c src/detection/os/os_windows.cpp src/detection/packages/packages_windows.c diff --git a/README.md b/README.md index 8e601d73a..c84ccf393 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ All categories not listed here should work without needing a specific implementa ##### Available Modules ``` -Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, OpenCL, OpenGL, Packages, Physical Display, Player, Power Adapter, Processes, PublicIP, Separator, OS, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Vulkan, Wallpaper, Wifi, WM, WMTheme +Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, OpenCL, OpenGL, Packages, Player, Power Adapter, Processes, PublicIP, Separator, OS, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Vulkan, Wallpaper, Wifi, WM, WMTheme ``` ##### Builtin logos diff --git a/doc/json_schema.json b/doc/json_schema.json index 50773239f..279aac96c 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -489,11 +489,11 @@ "localip", "media", "memory", + "monitor", "opencl", "opengl", "os", "packages", - "physicaldisplay", "player", "poweradapter", "processes", @@ -562,10 +562,10 @@ "locale", "media", "memory", + "monitor", "opencl", "os", "packages", - "physicaldisplay", "player", "poweradapter", "processes", diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 14610c45d..4ac9ddc2d 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -154,12 +154,7 @@ static bool parseModuleJsonObject(const char* type, yyjson_val* module) return tryModule(type, module, FF_MEDIA_MODULE_NAME, ffParseMediaJsonObject) || tryModule(type, module, FF_MEMORY_MODULE_NAME, ffParseMemoryJsonObject) || - false; - } - - case 'N': { - return - tryModule(type, module, FF_PHYSICALDISPLAY_MODULE_NAME, ffParsePhysicalDisplayJsonObject) || + tryModule(type, module, FF_MONITOR_MODULE_NAME, ffParseMonitorJsonObject) || false; } diff --git a/src/data/config_user.txt b/src/data/config_user.txt index 049399208..619bdfdc3 100644 --- a/src/data/config_user.txt +++ b/src/data/config_user.txt @@ -349,6 +349,7 @@ #--shell-key Shell #--display-key Display {1} #--brightness-key Brightness ({1}) +#--monitor-key Monitor #--de-key DE #--wm-key WM #--wmtheme-key WM Theme @@ -372,7 +373,6 @@ #--publicip-key Public IP #--wifi-key Wifi #--weather-key Weather -#--physicaldisplay-key Physical Display #--player-key Media Player #--media-key Media #--datetime-key Date Time @@ -422,7 +422,7 @@ #--localip-format #--publicip-format #--weather-format -#--physicaldisplay-format +#--monitor-format #--player-format #--media-format #--datetime-format @@ -469,7 +469,7 @@ #--localip-key-color #--publicip-key-color #--weather-key-color -#--physicaldisplay-key-color +#--monitor-key-color #--player-key-color #--media-key-color #--datetime-key-color diff --git a/src/detection/physicaldisplay/physicaldisplay.h b/src/detection/monitor/monitor.h similarity index 67% rename from src/detection/physicaldisplay/physicaldisplay.h rename to src/detection/monitor/monitor.h index dd29cdd26..1fc514d90 100644 --- a/src/detection/physicaldisplay/physicaldisplay.h +++ b/src/detection/monitor/monitor.h @@ -1,12 +1,12 @@ #include "fastfetch.h" -typedef struct FFPhysicalDisplayResult +typedef struct FFMonitorResult { FFstrbuf name; uint32_t width; // native / maximum resolution, in pixels uint32_t height; // native / maximum resolution, in pixels uint32_t physicalWidth; // in mm uint32_t physicalHeight; // in mm -} FFPhysicalDisplayResult; +} FFMonitorResult; -const char* ffDetectPhysicalDisplay(FFlist* results); +const char* ffDetectMonitor(FFlist* results); diff --git a/src/detection/physicaldisplay/physicaldisplay_apple.c b/src/detection/monitor/monitor_apple.c similarity index 85% rename from src/detection/physicaldisplay/physicaldisplay_apple.c rename to src/detection/monitor/monitor_apple.c index 304f3dbda..bd4a43354 100644 --- a/src/detection/physicaldisplay/physicaldisplay_apple.c +++ b/src/detection/monitor/monitor_apple.c @@ -1,4 +1,4 @@ -#include "physicaldisplay.h" +#include "monitor.h" #include "detection/displayserver/displayserver.h" #include "util/apple/cf_helpers.h" #include "util/apple/ddcci.h" @@ -23,18 +23,18 @@ static const char* detectWithDisplayServices(const FFDisplayServerResult* displa width <= 0 || height <= 0) continue; - FFPhysicalDisplayResult* physicalDisplay = (FFPhysicalDisplayResult*) ffListAdd(results); - physicalDisplay->width = (uint32_t) width; - physicalDisplay->height = (uint32_t) height; - ffStrbufInit(&physicalDisplay->name); + FFMonitorResult* monitor = (FFMonitorResult*) ffListAdd(results); + monitor->width = (uint32_t) width; + monitor->height = (uint32_t) height; + ffStrbufInit(&monitor->name); CFDictionaryRef productNames; if(!ffCfDictGetDict(displayInfo, CFSTR(kDisplayProductName), &productNames)) - ffCfDictGetString(productNames, CFSTR("en_US"), &physicalDisplay->name); + ffCfDictGetString(productNames, CFSTR("en_US"), &monitor->name); CGSize size = CGDisplayScreenSize((CGDirectDisplayID) display->id); - physicalDisplay->physicalWidth = (uint32_t) (size.width + 0.5); - physicalDisplay->physicalHeight = (uint32_t) (size.height + 0.5); + monitor->physicalWidth = (uint32_t) (size.width + 0.5); + monitor->physicalHeight = (uint32_t) (size.height + 0.5); } } } @@ -91,7 +91,7 @@ static const char* detectWithDdcci(FFlist* results) ffEdidGetPhysicalResolution(edidData, &width, &height); if (width == 0 || height == 0) continue; - FFPhysicalDisplayResult* display = (FFPhysicalDisplayResult*) ffListAdd(results); + FFMonitorResult* display = (FFMonitorResult*) ffListAdd(results); display->width = width; display->height = height; ffStrbufInit(&display->name); @@ -101,7 +101,7 @@ static const char* detectWithDdcci(FFlist* results) return NULL; } -const char* ffDetectPhysicalDisplay(FFlist* results) +const char* ffDetectMonitor(FFlist* results) { const FFDisplayServerResult* displayServer = ffConnectDisplayServer(); diff --git a/src/detection/physicaldisplay/physicaldisplay_linux.c b/src/detection/monitor/monitor_linux.c similarity index 90% rename from src/detection/physicaldisplay/physicaldisplay_linux.c rename to src/detection/monitor/monitor_linux.c index 08d94225b..9bbc7f6b7 100644 --- a/src/detection/physicaldisplay/physicaldisplay_linux.c +++ b/src/detection/monitor/monitor_linux.c @@ -1,4 +1,4 @@ -#include "physicaldisplay.h" +#include "monitor.h" #include "common/io/io.h" #include "util/edidHelper.h" @@ -6,7 +6,7 @@ #include -const char* ffDetectPhysicalDisplay(FFlist* results) +const char* ffDetectMonitor(FFlist* results) { const char* drmDirPath = "/sys/class/drm/"; @@ -46,7 +46,7 @@ const char* ffDetectPhysicalDisplay(FFlist* results) if (tmp) plainName = tmp + 1; } - FFPhysicalDisplayResult* display = (FFPhysicalDisplayResult*) ffListAdd(results); + FFMonitorResult* display = (FFMonitorResult*) ffListAdd(results); display->width = width; display->height = height; ffStrbufInitS(&display->name, plainName); diff --git a/src/detection/monitor/monitor_nosupport.c b/src/detection/monitor/monitor_nosupport.c new file mode 100644 index 000000000..c5bd0547a --- /dev/null +++ b/src/detection/monitor/monitor_nosupport.c @@ -0,0 +1,6 @@ +#include "monitor.h" + +const char* ffDetectMonitor(FF_MAYBE_UNUSED FFlist* results) +{ + return "Not supported on this platform"; +} diff --git a/src/detection/physicaldisplay/physicaldisplay_windows.c b/src/detection/monitor/monitor_windows.c similarity index 89% rename from src/detection/physicaldisplay/physicaldisplay_windows.c rename to src/detection/monitor/monitor_windows.c index cf6de8168..5bd57dc64 100644 --- a/src/detection/physicaldisplay/physicaldisplay_windows.c +++ b/src/detection/monitor/monitor_windows.c @@ -1,4 +1,4 @@ -#include "physicaldisplay.h" +#include "monitor.h" #include "common/io/io.h" #include "util/edidHelper.h" @@ -16,7 +16,7 @@ static inline void wrapSetupDiDestroyDeviceInfoList(HDEVINFO* hdev) SetupDiDestroyDeviceInfoList(*hdev); } -const char* ffDetectPhysicalDisplay(FFlist* results) +const char* ffDetectMonitor(FFlist* results) { //https://learn.microsoft.com/en-us/windows/win32/power/enumerating-battery-devices HDEVINFO hdev __attribute__((__cleanup__(wrapSetupDiDestroyDeviceInfoList))) = @@ -36,7 +36,7 @@ const char* ffDetectPhysicalDisplay(FFlist* results) ffEdidGetPhysicalResolution(edidData, &width, &height); if (width == 0 || height == 0) continue; - FFPhysicalDisplayResult* display = (FFPhysicalDisplayResult*) ffListAdd(results); + FFMonitorResult* display = (FFMonitorResult*) ffListAdd(results); display->width = width; display->height = height; ffStrbufInit(&display->name); diff --git a/src/detection/physicaldisplay/physicaldisplay_nosupport.c b/src/detection/physicaldisplay/physicaldisplay_nosupport.c deleted file mode 100644 index 07282b1bf..000000000 --- a/src/detection/physicaldisplay/physicaldisplay_nosupport.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "physicaldisplay.h" - -const char* ffDetectPhysicalDisplay(FF_MAYBE_UNUSED FFlist* results) -{ - return "Not supported on this platform"; -} diff --git a/src/fastfetch.c b/src/fastfetch.c index 23ae425ae..40b87db6a 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -200,6 +200,18 @@ static inline void printCommandHelp(const char* command) "Screen name" ); } + else if(ffStrEqualsIgnCase(command, "monitor-format")) + { + constructAndPrintCommandHelpFormat("monitor", "{}", 6, + "Display name", + "Display native resolution width in pixels", + "Display native resolution height in pixels", + "Display physical width in millimeters", + "Display physical height in millimeters", + "Display physical diagonal length in inches", + "Display physical pixels per inch (PPI)" + ); + } else if(ffStrEqualsIgnCase(command, "de-format")) { constructAndPrintCommandHelpFormat("de", "{2} {3}", 3, @@ -400,18 +412,6 @@ static inline void printCommandHelp(const char* command) "Connection Security algorithm" ); } - else if(ffStrEqualsIgnCase(command, "physicaldisplay-format")) - { - constructAndPrintCommandHelpFormat("physicaldisplay", "{}", 6, - "Display name", - "Display native resolution width in pixels", - "Display native resolution height in pixels", - "Display physical width in millimeters", - "Display physical height in millimeters", - "Display physical diagonal length in inches", - "Display physical pixels per inch (PPI)" - ); - } else if(ffStrEqualsIgnCase(command, "player-format")) { constructAndPrintCommandHelpFormat("player", "{}", 4, @@ -1010,6 +1010,7 @@ static void parseOption(FFdata* data, const char* key, const char* value) else if(ffParseShellCommandOptions(&instance.config.shell, key, value)) {} else if(ffParseDisplayCommandOptions(&instance.config.display, key, value)) {} else if(ffParseBrightnessCommandOptions(&instance.config.brightness, key, value)) {} + else if(ffParseMonitorCommandOptions(&instance.config.nativeResolution, key, value)) {} else if(ffParseDECommandOptions(&instance.config.de, key, value)) {} else if(ffParseWifiCommandOptions(&instance.config.wifi, key, value)) {} else if(ffParseWMCommandOptions(&instance.config.wm, key, value)) {} @@ -1037,7 +1038,6 @@ static void parseOption(FFdata* data, const char* key, const char* value) else if(ffParseWeatherCommandOptions(&instance.config.weather, key, value)) {} else if(ffParsePlayerCommandOptions(&instance.config.player, key, value)) {} else if(ffParseMediaCommandOptions(&instance.config.media, key, value)) {} - else if(ffParsePhysicalDisplayCommandOptions(&instance.config.nativeResolution, key, value)) {} else if(ffParseDateTimeCommandOptions(&instance.config.dateTime, key, value)) {} else if(ffParseVulkanCommandOptions(&instance.config.vulkan, key, value)) {} else if(ffParseOpenGLCommandOptions(&instance.config.openGL, key, value)) {} @@ -1271,8 +1271,8 @@ static void parseStructureCommand(const char* line, FFlist* customValues) ffPrintPlayer(&instance.config.player); else if(ffStrEqualsIgnCase(line, FF_MEDIA_MODULE_NAME)) ffPrintMedia(&instance.config.media); - else if(ffStrEqualsIgnCase(line, FF_PHYSICALDISPLAY_MODULE_NAME)) - ffPrintPhysicalDisplay(&instance.config.nativeResolution); + else if(ffStrEqualsIgnCase(line, FF_MONITOR_MODULE_NAME)) + ffPrintMonitor(&instance.config.nativeResolution); else if(ffStrEqualsIgnCase(line, FF_DATETIME_MODULE_NAME)) ffPrintDateTime(&instance.config.dateTime); else if(ffStrEqualsIgnCase(line, FF_COLORS_MODULE_NAME)) diff --git a/src/fastfetch.h b/src/fastfetch.h index 94438178d..3e77c204b 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -110,7 +110,7 @@ typedef struct FFconfig FFWeatherOptions weather; FFPlayerOptions player; FFMediaOptions media; - FFPhysicalDisplayOptions nativeResolution; + FFMonitorOptions nativeResolution; FFDateTimeOptions dateTime; FFVulkanOptions vulkan; FFOpenGLOptions openGL; diff --git a/src/modules/modules.h b/src/modules/modules.h index 3f0ee25ef..c5e75e525 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -30,7 +30,7 @@ #include "modules/localip/localip.h" #include "modules/media/media.h" #include "modules/memory/memory.h" -#include "modules/physicaldisplay/physicaldisplay.h" +#include "modules/monitor/monitor.h" #include "modules/opengl/opengl.h" #include "modules/opencl/opencl.h" #include "modules/os/os.h" diff --git a/src/modules/physicaldisplay/physicaldisplay.c b/src/modules/monitor/monitor.c similarity index 59% rename from src/modules/physicaldisplay/physicaldisplay.c rename to src/modules/monitor/monitor.c index a8e9b51ad..980223481 100644 --- a/src/modules/physicaldisplay/physicaldisplay.c +++ b/src/modules/monitor/monitor.c @@ -1,35 +1,34 @@ #include "common/printing.h" #include "common/jsonconfig.h" -#include "detection/physicaldisplay/physicaldisplay.h" -#include "modules/physicaldisplay/physicaldisplay.h" +#include "detection/monitor/monitor.h" +#include "modules/monitor/monitor.h" #include "util/stringUtils.h" #include -#define FF_PHYSICALDISPLAY_DISPLAY_NAME "Physical Display" -#define FF_PHYSICALDISPLAY_NUM_FORMAT_ARGS 7 +#define FF_MONITOR_NUM_FORMAT_ARGS 7 -void ffPrintPhysicalDisplay(FFPhysicalDisplayOptions* options) +void ffPrintMonitor(FFMonitorOptions* options) { - FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFPhysicalDisplayResult)); + FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFMonitorResult)); - const char* error = ffDetectPhysicalDisplay(&result); + const char* error = ffDetectMonitor(&result); if(error) { - ffPrintError(FF_PHYSICALDISPLAY_DISPLAY_NAME, 0, &options->moduleArgs, "%s", error); + ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, "%s", error); return; } if(!result.length) { - ffPrintError(FF_PHYSICALDISPLAY_DISPLAY_NAME, 0, &options->moduleArgs, "No physical display detected"); + ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, "No physical display detected"); return; } uint8_t index = 0; FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate(); - FF_LIST_FOR_EACH(FFPhysicalDisplayResult, display, result) + FF_LIST_FOR_EACH(FFMonitorResult, display, result) { double inch = sqrt(display->physicalWidth * display->physicalWidth + display->physicalHeight * display->physicalHeight) / 25.4; double ppi = sqrt(display->width * display->width + display->height * display->height) / inch; @@ -39,7 +38,7 @@ void ffPrintPhysicalDisplay(FFPhysicalDisplayOptions* options) ffStrbufClear(&key); if(options->moduleArgs.key.length == 0) { - ffStrbufAppendF(&key, "%s (%s)", FF_PHYSICALDISPLAY_DISPLAY_NAME, display->name.chars); + ffStrbufAppendF(&key, "%s (%s)", FF_MONITOR_MODULE_NAME, display->name.chars); } else { @@ -57,7 +56,7 @@ void ffPrintPhysicalDisplay(FFPhysicalDisplayOptions* options) } else { - ffPrintFormat(FF_PHYSICALDISPLAY_DISPLAY_NAME, index, &options->moduleArgs, FF_PHYSICALDISPLAY_NUM_FORMAT_ARGS, (FFformatarg[]) { + ffPrintFormat(FF_MONITOR_MODULE_NAME, index, &options->moduleArgs, FF_MONITOR_NUM_FORMAT_ARGS, (FFformatarg[]) { {FF_FORMAT_ARG_TYPE_STRBUF, &display->name}, {FF_FORMAT_ARG_TYPE_UINT, &display->width}, {FF_FORMAT_ARG_TYPE_UINT, &display->height}, @@ -72,15 +71,15 @@ void ffPrintPhysicalDisplay(FFPhysicalDisplayOptions* options) } } -void ffInitPhysicalDisplayOptions(FFPhysicalDisplayOptions* options) +void ffInitMonitorOptions(FFMonitorOptions* options) { - options->moduleName = FF_PHYSICALDISPLAY_MODULE_NAME; + options->moduleName = FF_MONITOR_MODULE_NAME; ffOptionInitModuleArg(&options->moduleArgs); } -bool ffParsePhysicalDisplayCommandOptions(FFPhysicalDisplayOptions* options, const char* key, const char* value) +bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, const char* value) { - const char* subKey = ffOptionTestPrefix(key, FF_PHYSICALDISPLAY_MODULE_NAME); + const char* subKey = ffOptionTestPrefix(key, FF_MONITOR_MODULE_NAME); if (!subKey) return false; if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs)) return true; @@ -88,15 +87,15 @@ bool ffParsePhysicalDisplayCommandOptions(FFPhysicalDisplayOptions* options, con return false; } -void ffDestroyPhysicalDisplayOptions(FFPhysicalDisplayOptions* options) +void ffDestroyMonitorOptions(FFMonitorOptions* options) { ffOptionDestroyModuleArg(&options->moduleArgs); } -void ffParsePhysicalDisplayJsonObject(yyjson_val* module) +void ffParseMonitorJsonObject(yyjson_val* module) { - FFPhysicalDisplayOptions __attribute__((__cleanup__(ffDestroyPhysicalDisplayOptions))) options; - ffInitPhysicalDisplayOptions(&options); + FFMonitorOptions __attribute__((__cleanup__(ffDestroyMonitorOptions))) options; + ffInitMonitorOptions(&options); if (module) { @@ -111,9 +110,9 @@ void ffParsePhysicalDisplayJsonObject(yyjson_val* module) if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs)) continue; - ffPrintError(FF_PHYSICALDISPLAY_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key); + ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key); } } - ffPrintPhysicalDisplay(&options); + ffPrintMonitor(&options); } diff --git a/src/modules/monitor/monitor.h b/src/modules/monitor/monitor.h new file mode 100644 index 000000000..a95a3fa74 --- /dev/null +++ b/src/modules/monitor/monitor.h @@ -0,0 +1,11 @@ +#pragma once + +#include "fastfetch.h" + +#define FF_MONITOR_MODULE_NAME "Monitor" + +void ffPrintMonitor(FFMonitorOptions* options); +void ffInitMonitorOptions(FFMonitorOptions* options); +bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, const char* value); +void ffDestroyMonitorOptions(FFMonitorOptions* options); +void ffParseMonitorJsonObject(yyjson_val* module); diff --git a/src/modules/physicaldisplay/option.h b/src/modules/monitor/option.h similarity index 73% rename from src/modules/physicaldisplay/option.h rename to src/modules/monitor/option.h index 3930a6253..ee2efc964 100644 --- a/src/modules/physicaldisplay/option.h +++ b/src/modules/monitor/option.h @@ -4,8 +4,8 @@ #include "common/option.h" -typedef struct FFPhysicalDisplayOptions +typedef struct FFMonitorOptions { const char* moduleName; FFModuleArgs moduleArgs; -} FFPhysicalDisplayOptions; +} FFMonitorOptions; diff --git a/src/modules/options.h b/src/modules/options.h index 14e665539..fbd845d3a 100644 --- a/src/modules/options.h +++ b/src/modules/options.h @@ -29,7 +29,7 @@ #include "modules/localip/option.h" #include "modules/media/option.h" #include "modules/memory/option.h" -#include "modules/physicaldisplay/option.h" +#include "modules/monitor/option.h" #include "modules/opengl/option.h" #include "modules/opencl/option.h" #include "modules/os/option.h" diff --git a/src/modules/physicaldisplay/physicaldisplay.h b/src/modules/physicaldisplay/physicaldisplay.h deleted file mode 100644 index a63213d65..000000000 --- a/src/modules/physicaldisplay/physicaldisplay.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "fastfetch.h" - -#define FF_PHYSICALDISPLAY_MODULE_NAME "PhysicalDisplay" - -void ffPrintPhysicalDisplay(FFPhysicalDisplayOptions* options); -void ffInitPhysicalDisplayOptions(FFPhysicalDisplayOptions* options); -bool ffParsePhysicalDisplayCommandOptions(FFPhysicalDisplayOptions* options, const char* key, const char* value); -void ffDestroyPhysicalDisplayOptions(FFPhysicalDisplayOptions* options); -void ffParsePhysicalDisplayJsonObject(yyjson_val* module);