Merge pull request #1446 from fastfetch-cli/dev

Release: v2.32.1

.github/workflows/ci.yml

@@ -274,7 +274,7 @@ jobs:
 
   macos-universal:
     name: macOS-universal
-    runs-on: macos-12
+    runs-on: macos-latest
     permissions:
       security-events: write
       contents: read
@@ -452,7 +452,7 @@ jobs:
           version: '7.5'
           run: |
             uname -a
-            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio py3-requests
+            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio hwdata py3-requests
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features

CHANGELOG.md

@@ -1,3 +1,70 @@
+# 2.32.1
+
+A hotfix for OpenBSD. No changes to other platforms.
+
+Bugfixes:
+* Fix package count detection on OpenBSD (Packages, OpenBSD)
+
+# 2.32.0
+
+Bugfixes:
+* Fix `pci.ids` file location on OpenBSD (GPU, OpenBSD)
+    * It's normally unused because enumerating PCI devices on OpenBSD requires root privileges
+* Fix bssid formatting (Wifi, Linux)
+* Fix Linux Lite distro detection (#1434, OS, Linux)
+* Suppress XE driver warnings from Mesa (#1435, OpenGL, Linux)
+* Fix format parameter name (#1443, Version)
+* Don't report useless information when Wifi is disabled (Wifi, FreeBSD)
+    * Currently there are issues when the SSID contains whitespaces. More fixes are expected in the future.
+* Always use physical size reported by X11 server to avoid inconsistent results (#1444, Display, Linux)
+
+Features:
+* Randomly select one if the logo source expands to multiple files (#1426, Logo)
+* Report mac product name when running Linux in MacBook (Host, Linux / FreeBSD)
+* Use screen size reported in DTD if make sense (Display)
+* Detect Virtualized Apple Silicon CPUs (CPU, Linux)
+* Add detection support for fvwm and ctwm (WM, OpenBSD / NetBSD)
+* Add Armbian-unofficial detection (OS, Linux)
+* Prefer surfaceless display when connect EGL (OpenGL)
+* Improve accuracy of WM detection on FreeBSD (WM, FreeBSD)
+* Add ratpoison window manager (WM, Linux)
+
+Logo:
+* Update Linux Lite
+* Add Serpent OS
+* Add Ultramarine Small
+* Update Debian
+
+# 2.31.0
+
+Bugfixes:
+* Improve performance of media detection; fix musikcube detection (Media, Linux)
+    * After the change, `general.processingTimeout` will also control the timeout of dbus remote calls
+* Fix invalid variable names (#1408, Users)
+* Change physical size detection to use basic display parameters (#1406)
+* Fix possible sigfaults when detecting displays (#1393)
+* Fix Nvidia card type detection
+* Fix wl-restart parsing (#1422, WM, Linux)
+* Fix syntax error in completion file (#1421)
+* Fix hunging when using `ssh-agent` as command text (#1418, Command, macOS)
+
+Features:
+* Remove support of xcb & xlib and xrandr extension is always required (Display)
+* Support preferred resolution & refresh rate detection
+    * On macOS there is no preferred resolution reported and maximum available resolution is reported instead.
+    * `--display-format {preferred-width}x{preferred-height}@{preferred-refresh-rate}`
+* Report scale factor in custom format (Display)
+    * `--display-format {scale-factor}`
+* Detect current Wi-Fi channel and maximum frequency (Wifi)
+* Report processor package count (#1413, CPU)
+* Remove duplicate whitespaces in CPU name
+* Support sakura terminal version & font detection (Terminal / TerminalFont, Linux)
+
+Logo:
+* Fix LMDE
+* Update MidOS
+* Add Windows Server 2025
+
 # 2.30.1
 
 Bugfixes:

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.30.1
+    VERSION 2.32.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -57,9 +57,7 @@ include(CMakeDependentOption)
 cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR ANDROID OR SunOS" OFF)
 cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD" OFF)
 cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DRM_AMDGPU "Enable libdrm_amdgpu" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
@@ -504,6 +502,7 @@ if(LINUX)
         src/detection/gpu/gpu_pci.c
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
+        src/detection/host/host_mac.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
         src/detection/keyboard/keyboard_linux.c
@@ -651,6 +650,7 @@ elseif(FreeBSD)
         src/detection/gpu/gpu_pci.c
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_bsd.c
+        src/detection/host/host_mac.c
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
@@ -883,6 +883,7 @@ elseif(APPLE)
         src/detection/gpu/gpu_apple.c
         src/detection/gpu/gpu_apple.m
         src/detection/host/host_apple.c
+        src/detection/host/host_mac.c
         src/detection/icons/icons_nosupport.c
         src/detection/initsystem/initsystem_linux.c
         src/detection/keyboard/keyboard_apple.c
@@ -951,6 +952,7 @@ elseif(WIN32)
         src/detection/dns/dns_windows.c
         src/detection/font/font_windows.c
         src/detection/gpu/gpu_windows.c
+        src/detection/host/host_mac.c
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
         src/detection/initsystem/initsystem_nosupport.c
@@ -1222,6 +1224,9 @@ endif()
 if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
     message(STATUS "Enabling custom link type: ${BINARY_LINK_TYPE}")
     target_compile_definitions(libfastfetch PRIVATE FF_DISABLE_DLOPEN=1)
+    if(NOT WIN32)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+    endif()
 endif()
 
 function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
@@ -1277,18 +1282,10 @@ ff_lib_enable(XCB_RANDR
     "xcb-randr"
     "XcbRandr"
 )
-ff_lib_enable(XCB
-    "xcb"
-    "Xcb"
-)
 ff_lib_enable(XRANDR
     "xrandr"
     "XRandr"
 )
-ff_lib_enable(X11
-    "x11"
-    "X11"
-)
 ff_lib_enable(DRM
     "libdrm"
     "Libdrm"

completions/fastfetch.zsh

@@ -26,7 +26,7 @@ def main():
         for flag in data[key]:
             if flag["long"] == "logo-color-[1-9]":
                 for i in range(1, 10):
-                    command_prefix = f"--logo-color-{i}[{flag["desc"]} ({i})]"
+                    command_prefix = f"--logo-color-{i}[{flag['desc']} ({i})]"
                     print_command(command_prefix, flag)
                 continue
 
@@ -34,11 +34,11 @@ def main():
                 continue
 
             if "short" in flag:
-                command_prefix = f"-{flag["short"]}[{flag["desc"]}]"
+                command_prefix = f"-{flag['short']}[{flag['desc']}]"
                 print_command(command_prefix, flag)
 
             if "long" in flag:
-                command_prefix = f"--{flag["long"]}[{flag["desc"]}]"
+                command_prefix = f"--{flag['long']}[{flag['desc']}]"
                 print_command(command_prefix, flag)
 
 

debian/changelog

@@ -1,3 +1,21 @@
+fastfetch (2.32.0) jammy; urgency=medium
+
+  * Update to 2.32.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 18 Dec 2024 10:39:06 +0800
+
+fastfetch (2.31.0) jammy; urgency=medium
+
+  * Update to 2.31.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 04 Dec 2024 08:41:40 +0800
+
+fastfetch (2.30.1) jammy; urgency=medium
+
+  * Update to 2.30.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 18 Nov 2024 15:40:48 +0800
+
 fastfetch (2.30.0) jammy; urgency=medium
 
   * Update to 2.30.0

debian/files

@@ -1 +1 @@
-fastfetch_2.30.0_source.buildinfo universe/utils optional
+fastfetch_2.32.0_source.buildinfo universe/utils optional

presets/ci.jsonc

@@ -87,8 +87,8 @@
         "opengl",
         "opencl",
         "users",
-        "bluetooth",
+        // "bluetooth", // doesn't work on macOS because it requires bluetooth permissions
-        "bluetoothradio",
+        // "bluetoothradio",
         "sound",
         "camera",
         "gamepad",

scripts/gen-man.py

@@ -9,7 +9,7 @@ For the format of the JSON file, see https://github.com/fastfetch-cli/fastfetch/
 """
 
 from json import load
-from datetime import date
+from datetime import datetime, timezone
 from time import time
 from re import search
 from os import environ, path
@@ -36,8 +36,10 @@ manSection = 1
 titlePage = "Fastfetch man page"
 # date (center footer)
 # format : "Month (abbreviation) Day Year"
-todayDate = date.fromtimestamp(
+todayDate = datetime.fromtimestamp(
-    int(environ.get("SOURCE_DATE_EPOCH", time()))).strftime("%b %d %Y")
+    int(environ.get("SOURCE_DATE_EPOCH", time())),
+    tz=timezone.utc,
+).strftime("%b %d %Y")
 # file to fastfetch version (left footer)
 pathToVersionFile = path.join(pathToCurrentDir, "../CMakeLists.txt")
 
@@ -52,7 +54,7 @@ optionSection = r"""
 Parsing is not case sensitive. E.g. \fB--logo-type\fR is
 equal to \fB--LOGO-TYPE\fR.
 
-If a value is between square brakets, it is optional.
+If a value is between square brackets, it is optional.
 An optional boolean value defaults to true if not specified.
 
 More detailed help messages for each options can be printed

src/common/dbus.c

@@ -171,7 +171,7 @@ DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const c
     if (arg)
         dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
 
-    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
 
@@ -189,7 +189,7 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
         DBUS_TYPE_STRING, &property,
         DBUS_TYPE_INVALID);
 
-    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
 

src/common/dbus.h

@@ -6,8 +6,6 @@
 #include "util/FFstrbuf.h"
 #include "common/library.h"
 
-#define FF_DBUS_TIMEOUT_MILLISECONDS 100
-
 typedef struct FFDBusLibrary
 {
     FF_LIBRARY_SYMBOL(dbus_bus_get)
@@ -38,4 +36,9 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
 bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
 bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);
 
+static inline DBusMessage* ffDBusGetAllProperties(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface)
+{
+    return ffDBusGetMethodReply(dbus, busName, objectPath, "org.freedesktop.DBus.Properties", "GetAll", interface);
+}
+
 #endif // FF_HAVE_DBUS

src/common/format.h

@@ -42,7 +42,5 @@ typedef struct FFformatarg
 
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
-#define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, numArgs, arguments) do {\
+#define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, arguments) \
-    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
+    ffParseFormatString((buffer), (formatstr), sizeof(arguments) / sizeof(*arguments), (arguments));
-    ffParseFormatString((buffer), (formatstr), (numArgs), (arguments));\
-} while (0)

src/common/init.c

@@ -76,19 +76,21 @@ static void resetConsole(void)
 }
 
 #ifdef _WIN32
-BOOL WINAPI consoleHandler(DWORD signal)
+BOOL WINAPI consoleHandler(FF_MAYBE_UNUSED DWORD signal)
 {
-    FF_UNUSED(signal);
     resetConsole();
     exit(0);
 }
 #else
-static void exitSignalHandler(int signal)
+static void exitSignalHandler(FF_MAYBE_UNUSED int signal)
 {
-    FF_UNUSED(signal);
     resetConsole();
     exit(0);
 }
+static void chldSignalHandler(FF_MAYBE_UNUSED int signal)
+{
+    // empty; used to interrupt the poll and read syscalls
+}
 #endif
 
 void ffStart(void)
@@ -118,6 +120,7 @@ void ffStart(void)
     sigaction(SIGINT, &action, NULL);
     sigaction(SIGTERM, &action, NULL);
     sigaction(SIGQUIT, &action, NULL);
+    sigaction(SIGCHLD, &(struct sigaction) { .sa_handler = chldSignalHandler }, NULL);
     #endif
 
     //reset everything to default before we start printing
@@ -179,15 +182,9 @@ void ffListFeatures(void)
         #if FF_HAVE_XCB_RANDR
             "xcb-randr\n"
         #endif
-        #if FF_HAVE_XCB
-            "xcb\n"
-        #endif
         #if FF_HAVE_XRANDR
             "xrandr\n"
         #endif
-        #if FF_HAVE_X11
-            "x11\n"
-        #endif
         #if FF_HAVE_DRM
             "drm\n"
         #endif

src/common/io/io_unix.c

@@ -1,6 +1,7 @@
 #include "io.h"
 #include "fastfetch.h"
 #include "util/stringUtils.h"
+#include "common/time.h"
 
 #include <fcntl.h>
 #include <termios.h>
@@ -145,10 +146,10 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o
     if (wordexp(in, &exp, 0) != 0)
         return false;
 
-    if (exp.we_wordc == 1)
+    if (exp.we_wordc >= 1)
     {
         result = true;
-        ffStrbufSetS(out, exp.we_wordv[0]);
+        ffStrbufSetS(out, exp.we_wordv[exp.we_wordc > 1 ? ffTimeGetNow() % exp.we_wordc : 0]);
     }
 
     wordfree(&exp);
@@ -159,10 +160,10 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o
     if (glob(in, GLOB_NOSORT | GLOB_TILDE, NULL, &gb) != 0)
         return false;
 
-    if (gb.gl_matchc == 1)
+    if (gb.gl_matchc >= 1)
     {
         result = true;
-        ffStrbufSetS(out, gb.gl_pathv[0]);
+        ffStrbufSetS(out, gb.gl_pathv[gb.gl_matchc > 1 ? ffTimeGetNow() % gb.gl_matchc : 0]);
     }
 
     globfree(&gb);

src/common/option.h

@@ -6,6 +6,20 @@ struct yyjson_val;
 struct yyjson_mut_doc;
 struct yyjson_mut_val;
 
+typedef struct FFModuleFormatArg
+{
+    const char* desc;
+    const char* name;
+} FFModuleFormatArg;
+
+typedef struct FFModuleFormatArgList
+{
+    FFModuleFormatArg* args;
+    uint32_t count;
+} FFModuleFormatArgList;
+
+#define FF_FORMAT_ARG_LIST(list) { .args = list, .count = sizeof(list) / sizeof(FFModuleFormatArg) }
+
 // Must be the first field of FFModuleOptions
 typedef struct FFModuleBaseInfo
 {
@@ -19,32 +33,10 @@ typedef struct FFModuleBaseInfo
     void (*parseJsonObject)(void* options, struct yyjson_val *module);
     void (*printModule)(void* options);
     void (*generateJsonResult)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module);
-    void (*printHelpFormat)(void);
     void (*generateJsonConfig)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* obj);
+    FFModuleFormatArgList formatArgs;
 } FFModuleBaseInfo;
 
-static inline void ffOptionInitModuleBaseInfo(
-    FFModuleBaseInfo* baseInfo,
-    const char* name,
-    const char* description,
-    void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value)
-    void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module)
-    void* printModule, // void (*const printModule)(void* options)
-    void* generateJsonResult, // void (*const generateJsonResult)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj)
-    void (*printHelpFormat)(void),
-    void* generateJsonConfig // void (*const generateJsonConfig)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj)
-)
-{
-    baseInfo->name = name;
-    baseInfo->description = description;
-    baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions;
-    baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject;
-    baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule;
-    baseInfo->generateJsonResult = (__typeof__(baseInfo->generateJsonResult)) generateJsonResult;
-    baseInfo->printHelpFormat = printHelpFormat;
-    baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig;
-}
-
 typedef enum __attribute__((__packed__)) FFModuleKeyType
 {
     FF_MODULE_KEY_TYPE_NONE = 0,

src/common/printing.c

@@ -50,7 +50,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
             else
             {
                 FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
-                FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 2, ((FFformatarg[]){
+                FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, ((FFformatarg[]) {
                     FF_FORMAT_ARG(moduleIndex, "index"),
                     FF_FORMAT_ARG(moduleArgs->keyIcon, "icon"),
                 }));
@@ -148,18 +148,3 @@ void ffPrintCharTimes(char c, uint32_t times)
     if(remaining > 0)
         fwrite(str, 1, remaining, stdout);
 }
-
-void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[])
-{
-    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateS(name);
-    ffStrbufLowerCase(&buffer);
-    printf("--%s-format:\n", buffer.chars);
-    printf("Sets the format string for %s output.\n", name);
-    puts("To see how a format string is constructed, take a look at \"fastfetch --help format\".");
-    puts("The following values are passed:");
-
-    for(unsigned i = 0; i < numArgs; i++)
-        printf("        {%u}: %s\n", i + 1, args[i]);
-
-    printf("The default is something similar to \"%s\".\n", def);
-}

src/common/printing.h

@@ -14,16 +14,8 @@ typedef enum __attribute__((__packed__)) FFPrintType {
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
 void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
-#define FF_PRINT_FORMAT_CHECKED(moduleName, moduleIndex, moduleArgs, printType, numArgs, arguments) do {\
+#define FF_PRINT_FORMAT_CHECKED(moduleName, moduleIndex, moduleArgs, printType, arguments) \
-    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
+    ffPrintFormat((moduleName), (moduleIndex), (moduleArgs), (printType), (sizeof(arguments) / sizeof(*arguments)), (arguments));
-    ffPrintFormat((moduleName), (moduleIndex), (moduleArgs), (printType), (numArgs), (arguments));\
-} while (0)
 FF_C_PRINTF(5, 6) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
 void ffPrintColor(const FFstrbuf* colorValue);
 void ffPrintCharTimes(char c, uint32_t times);
-
-void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[]);
-#define FF_PRINT_MODULE_FORMAT_HELP_CHECKED(moduleName, def, numArgs, args) do {\
-    static_assert(sizeof(args) / sizeof(*args) == (numArgs), "Invalid number of format arguments");\
-    ffPrintModuleFormatHelp((moduleName), (def), (numArgs), (args));\
-} while (0)

src/common/processing_linux.c

@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 #include "common/processing.h"
 #include "common/io/io.h"
-#include "common/time.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
@@ -90,6 +89,16 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
                 waitpid(childPid, NULL, 0);
                 return "poll(&pollfd, 1, timeout) timeout (try increasing --processing-timeout)";
             }
+            else if (errno == EINTR)
+            {
+                // The child process has been terminated. See `chldSignalHandler` in `common/init.c`
+                if (waitpid(childPid, NULL, WNOHANG) == childPid)
+                {
+                    // Read remaining data from the pipe
+                    fcntl(childPipeFd, F_SETFL, O_CLOEXEC | O_NONBLOCK);
+                    childPid = -1;
+                }
+            }
             else if (pollfd.revents & POLLERR)
             {
                 kill(childPid, SIGTERM);
@@ -104,7 +113,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         else if (nRead == 0)
         {
             int stat_loc = 0;
-            if (waitpid(childPid, &stat_loc, 0) == childPid)
+            if (childPid > 0 && waitpid(childPid, &stat_loc, 0) == childPid)
             {
                 if (!WIFEXITED(stat_loc))
                     return "child process exited abnormally";
@@ -113,10 +122,15 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
                 // We only handle 127 as an error. See `getTerminalVersionUrxvt` in `terminalshell.c`
                 return NULL;
             }
-            return "waitpid() failed";
+            return NULL;
         }
         else if (nRead < 0)
-            break;
+        {
+            if (errno == EAGAIN)
+                return NULL;
+            else
+                break;
+        }
     };
 
     return "read(childPipeFd, str, FF_PIPE_BUFSIZ) failed";

src/detection/brightness/brightness_linux.c

@@ -99,7 +99,7 @@ double ddca_set_default_sleep_multiplier(double multiplier); // ddcutil 1.4
 DDCA_Status ddca_init(const char *libopts, int syslog_level, int opts);
 #endif
 
-static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
+static const char* detectWithDdcci(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
 {
     FF_LIBRARY_LOAD(libddcutil, "dlopen ddcutil failed", "libddcutil" FF_LIBRARY_EXTENSION, 5);
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_display_info_list2)

src/detection/cpu/cpu.c

@@ -16,6 +16,7 @@ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu)
     ffStrbufRemoveStrings(&cpu->name, ARRAY_SIZE(removeStrings), removeStrings);
     ffStrbufSubstrBeforeFirstC(&cpu->name, '@'); //Cut the speed output in the name as we append our own
     ffStrbufTrimRight(&cpu->name, ' '); //If we removed the @ in previous step there was most likely a space before it
+    ffStrbufRemoveDupWhitespaces(&cpu->name);
     return NULL;
 }
 

src/detection/cpu/cpu.h

@@ -15,6 +15,7 @@ typedef struct FFCPUResult
     FFstrbuf name;
     FFstrbuf vendor;
 
+    uint16_t packages;
     uint16_t coresPhysical;
     uint16_t coresLogical;
     uint16_t coresOnline;

src/detection/cpu/cpu_apple.c

@@ -109,6 +109,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         return "sysctlbyname(machdep.cpu.brand_string) failed";
 
     ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
+    cpu->packages = (uint16_t) ffSysctlGetInt("hw.packages", 1);
     if (cpu->vendor.length == 0 && ffStrbufStartsWithS(&cpu->name, "Apple "))
         ffStrbufAppendS(&cpu->vendor, "Apple");
 

src/detection/cpu/cpu_arm.h

@@ -168,7 +168,8 @@ static const char* qcomPartId2name(uint32_t partId)
 {
     switch (partId)
     {
-    case 0x001: return "Oryon";
+    case 0x001: return "Oryon 1";
+    case 0x002: return "Oryon 2";
     case 0x00f: return "Scorpion";
     case 0x02d: return "Scorpion";
     case 0x04d: return "Krait";
@@ -262,6 +263,9 @@ static const char* applePartId2name(uint32_t partId)
     case 0x037: return "Everest-A16";
     case 0x038: return "Blizzard-M2-Max";
     case 0x039: return "Avalanche-M2-Max";
+    case 0x046: return "Sawtooth-M11";
+    case 0x048: return "Sawtooth-M3-Max";
+    case 0x049: return "Everest-M3-Max";
     default: return NULL;
     }
 }

src/detection/cpu/cpu_linux.c

@@ -159,40 +159,44 @@ static void detectAndroid(FFCPUResult* cpu)
 #if __arm__ || __aarch64__
 #include "cpu_arm.h"
 
-static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
+static void detectArmName(FFstrbuf* cpuinfo, FFCPUResult* cpu, uint32_t implId)
 {
-    FF_AUTO_FREE char* line = NULL;
+    char* line = NULL;
-    rewind(cpuinfo);
     size_t len = 0;
     uint32_t lastPartId = UINT32_MAX;
     uint32_t num = 0;
-    while(getline(&line, &len, cpuinfo) != -1)
+    while(ffStrbufGetline(&line, &len, cpuinfo))
     {
         if (!ffStrStartsWith(line, "CPU part\t: ")) continue;
         uint32_t partId = (uint32_t) strtoul(line + strlen("CPU part\t: "), NULL, 16);
         const char* name = NULL;
-        if (partId > 0) // Linux reports 0 for unknown CPUs
+        switch (implId)
         {
-            switch (implId)
+            case 0x41: name = armPartId2name(partId); break;
-            {
+            case 0x42: name = brcmPartId2name(partId); break;
-                case 0x41: name = armPartId2name(partId); break;
+            case 0x43: name = caviumPartId2name(partId); break;
-                case 0x42: name = brcmPartId2name(partId); break;
+            case 0x44: name = decPartId2name(partId); break;
-                case 0x43: name = caviumPartId2name(partId); break;
+            case 0x46: name = fujitsuPartId2name(partId); break;
-                case 0x44: name = decPartId2name(partId); break;
+            case 0x48: name = hisiPartId2name(partId); break;
-                case 0x46: name = fujitsuPartId2name(partId); break;
+            case 0x4e: name = nvidiaPartId2name(partId); break;
-                case 0x48: name = hisiPartId2name(partId); break;
+            case 0x50: name = apmPartId2name(partId); break;
-                case 0x4e: name = nvidiaPartId2name(partId); break;
+            case 0x51: name = qcomPartId2name(partId); break;
-                case 0x50: name = apmPartId2name(partId); break;
+            case 0x53: name = samsungPartId2name(partId); break;
-                case 0x51: name = qcomPartId2name(partId); break;
+            case 0x56: name = marvellPartId2name(partId); break;
-                case 0x53: name = samsungPartId2name(partId); break;
+            case 0x61:
-                case 0x56: name = marvellPartId2name(partId); break;
+                if (partId == 0)
-                case 0x61: name = applePartId2name(partId); break;
+                {
-                case 0x66: name = faradayPartId2name(partId); break;
+                    // https://github.com/Dr-Noob/cpufetch/issues/213#issuecomment-1927782105
-                case 0x69: name = intelPartId2name(partId); break;
+                    ffStrbufSetStatic(&cpu->name, "Virtualized Apple Silicon");
-                case 0x6d: name = msPartId2name(partId); break;
+                    return;
-                case 0x70: name = ftPartId2name(partId); break;
+                }
-                case 0xc0: name = amperePartId2name(partId); break;
+                name = applePartId2name(partId);
-            }
+                break;
+            case 0x66: name = faradayPartId2name(partId); break;
+            case 0x69: name = intelPartId2name(partId); break;
+            case 0x6d: name = msPartId2name(partId); break;
+            case 0x70: name = ftPartId2name(partId); break;
+            case 0xc0: name = amperePartId2name(partId); break;
         }
         if (lastPartId != partId)
         {
@@ -220,18 +224,18 @@ static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
 #endif
 
 static const char* parseCpuInfo(
-    FF_MAYBE_UNUSED FILE* cpuinfo,
+    FFstrbuf* cpuinfo,
-    FF_MAYBE_UNUSED FFCPUResult* cpu,
+    FFCPUResult* cpu,
     FF_MAYBE_UNUSED FFstrbuf* physicalCoresBuffer,
     FF_MAYBE_UNUSED FFstrbuf* cpuMHz,
     FF_MAYBE_UNUSED FFstrbuf* cpuIsa,
     FF_MAYBE_UNUSED FFstrbuf* cpuUarch,
     FF_MAYBE_UNUSED FFstrbuf* cpuImplementer)
 {
-    FF_AUTO_FREE char* line = NULL;
+    char* line = NULL;
     size_t len = 0;
 
-    while(getline(&line, &len, cpuinfo) != -1)
+    while(ffStrbufGetline(&line, &len, cpuinfo))
     {
         //Stop after reasonable information is acquired
         if((*line == '\0' || *line == '\n')
@@ -465,11 +469,32 @@ FF_MAYBE_UNUSED static void detectArmSoc(FFCPUResult* cpu)
     }
 }
 
+FF_MAYBE_UNUSED static uint16_t getPackageCount(FFstrbuf* cpuinfo)
+{
+    const char* p = cpuinfo->chars;
+    uint64_t low = 0, high = 0;
+
+    while ((p = memmem(p, cpuinfo->length - (uint32_t) (p - cpuinfo->chars), "\nphysical id\t:", strlen("\nphysical id\t:"))))
+    {
+        if (!p) break;
+        p += strlen("\nphysical id\t:");
+        char* pend;
+        unsigned long id = strtoul(p, &pend, 10);
+        if (__builtin_expect(id > 64, false)) // Do 129-socket boards exist?
+            high |= 1 << (id - 64);
+        else
+            low |= 1 << id;
+        p = pend;
+    }
+
+    return (uint16_t) (__builtin_popcountll(low) + __builtin_popcountll(high));
+}
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
-    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
+    FF_STRBUF_AUTO_DESTROY cpuinfo = ffStrbufCreateA(PROC_FILE_BUFFSIZ);
-    if(cpuinfo == NULL)
+    if (!ffReadFileBuffer("/proc/cpuinfo", &cpuinfo) || cpuinfo.length == 0)
-        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+        return "ffReadFileBuffer(\"/proc/cpuinfo\") failed";
 
     cpu->temperature = options->temp ? detectCPUTemp() : FF_CPU_TEMP_UNSET;
 
@@ -479,12 +504,15 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     FF_STRBUF_AUTO_DESTROY cpuUarch = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY cpuImplementerStr = ffStrbufCreate();
 
-    const char* error = parseCpuInfo(cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
+    const char* error = parseCpuInfo(&cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
     if (error) return error;
 
     cpu->coresLogical = (uint16_t) get_nprocs_conf();
     cpu->coresOnline = (uint16_t) get_nprocs();
     cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);
+    #if __x86_64__ || __i386__
+    cpu->packages = getPackageCount(&cpuinfo);
+    #endif
 
     // Ref https://github.com/fastfetch-cli/fastfetch/issues/1194#issuecomment-2295058252
     ffCPUDetectSpeedByCpuid(cpu);
@@ -519,7 +547,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     #endif
 
     if (cpu->name.length == 0)
-        detectArmName(cpuinfo, cpu, cpuImplementer);
+        detectArmName(&cpuinfo, cpu, cpuImplementer);
     #endif
 
     return NULL;

src/detection/cpu/cpu_windows.c

@@ -100,9 +100,7 @@ static const char* detectNCores(FFCPUResult* cpu)
         ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
     )
     {
-        if (ptr->Relationship == RelationProcessorCore)
+        if (ptr->Relationship == RelationGroup)
-            ++cpu->coresPhysical;
-        else if (ptr->Relationship == RelationGroup)
         {
             for (uint32_t index = 0; index < ptr->Group.ActiveGroupCount; ++index)
             {
@@ -110,6 +108,10 @@ static const char* detectNCores(FFCPUResult* cpu)
                 cpu->coresLogical += ptr->Group.GroupInfo[index].MaximumProcessorCount;
             }
         }
+        else if (ptr->Relationship == RelationProcessorCore)
+            ++cpu->coresPhysical;
+        else if (ptr->Relationship == RelationProcessorPackage)
+            cpu->packages++;
     }
 
     return NULL;

src/detection/displayserver/displayserver.c

@@ -7,6 +7,9 @@ FFDisplayResult* ffdsAppendDisplay(
     double refreshRate,
     uint32_t scaledWidth,
     uint32_t scaledHeight,
+    uint32_t preferredWidth,
+    uint32_t preferredHeight,
+    double preferredRefreshRate,
     uint32_t rotation,
     FFstrbuf* name,
     FFDisplayType type,
@@ -25,6 +28,9 @@ FFDisplayResult* ffdsAppendDisplay(
     display->refreshRate = refreshRate;
     display->scaledWidth = scaledWidth;
     display->scaledHeight = scaledHeight;
+    display->preferredWidth = preferredWidth;
+    display->preferredHeight = preferredHeight;
+    display->preferredRefreshRate = preferredRefreshRate;
     display->rotation = rotation;
     ffStrbufInitMove(&display->name, name);
     display->type = type;

src/detection/displayserver/displayserver.h

@@ -36,7 +36,9 @@
 #define FF_WM_PRETTY_ICEWM "IceWM"
 #define FF_WM_PRETTY_SPECTRWM "spectrwm"
 #define FF_WM_PRETTY_DTWM "dtwm"
-
+#define FF_WM_PRETTY_FVWM "fvwm"
+#define FF_WM_PRETTY_CTWM "ctwm"
+#define FF_WM_PRETTY_RATPOISON "ratpoison"
 
 #define FF_WM_PROTOCOL_TTY "TTY"
 #define FF_WM_PROTOCOL_X11 "X11"
@@ -58,17 +60,20 @@ typedef enum __attribute__((__packed__)) FFDisplayHdrStatus
 
 typedef struct FFDisplayResult
 {
-    uint32_t width;
+    uint32_t width; // in px
-    uint32_t height;
+    uint32_t height; // in px
-    double refreshRate;
+    double refreshRate; // in Hz
-    uint32_t scaledWidth;
+    uint32_t scaledWidth; // in px
-    uint32_t scaledHeight;
+    uint32_t scaledHeight; // in px
+    uint32_t preferredWidth; // in px
+    uint32_t preferredHeight; // in px
+    double preferredRefreshRate; // in Hz
     FFstrbuf name;
     FFDisplayType type;
     uint32_t rotation;
     uint64_t id; // platform dependent
-    uint32_t physicalWidth;
+    uint32_t physicalWidth; // in mm
-    uint32_t physicalHeight;
+    uint32_t physicalHeight; // in mm
     bool primary;
     const char* platformApi;
     uint8_t bitDepth;
@@ -97,6 +102,9 @@ FFDisplayResult* ffdsAppendDisplay(
     double refreshRate,
     uint32_t scaledWidth,
     uint32_t scaledHeight,
+    uint32_t preferredWidth,
+    uint32_t preferredHeight,
+    double preferredRefreshRate,
     uint32_t rotation,
     FFstrbuf* name,
     FFDisplayType type,

src/detection/displayserver/displayserver_android.c

@@ -61,6 +61,9 @@ static void detectWithDumpsys(FFDisplayServerResult* ds)
                 0,
                 0,
                 0,
+                0,
+                0,
+                0,
                 &name,
                 FF_DISPLAY_TYPE_UNKNOWN,
                 false,
@@ -97,6 +100,9 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
             (uint32_t) (height / scaleFactor + .5),
             0,
             0,
+            0,
+            0,
+            NULL,
             FF_DISPLAY_TYPE_BUILTIN,
             false,
             0,

src/detection/displayserver/displayserver_apple.c

@@ -60,7 +60,11 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
             }
             #endif
+
             uint32_t physicalWidth = 0, physicalHeight = 0;
+            uint32_t preferredWidth = 0, preferredHeight = 0;
+            double preferredRefreshRate = 0;
+
             if(displayInfo)
             {
                 CFDictionaryRef productNames;
@@ -76,9 +80,35 @@ static void detectDisplays(FFDisplayServerResult* ds)
                     if (edidLength >= 128)
                         ffEdidGetPhysicalSize(edidData, &physicalWidth, &physicalHeight);
                 }
+
+                if (!physicalWidth || !physicalHeight)
+                {
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayHorizontalImageSize), (int*) &physicalWidth) == NULL)
+                        ffCfDictGetInt(displayInfo, CFSTR(kDisplayVerticalImageSize), (int*) &physicalHeight);
+                }
+
+                ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), (int*) &preferredWidth);
+                ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelHeight"), (int*) &preferredHeight);
+                if (preferredWidth && preferredHeight)
+                {
+                    FF_CFTYPE_AUTO_RELEASE CFArrayRef allModes = CGDisplayCopyAllDisplayModes(screen, NULL);
+                    if (allModes)
+                    {
+                        for (CFIndex i = 0, count = CFArrayGetCount(allModes); i < count; i++)
+                        {
+                            CGDisplayModeRef modeInfo = (CGDisplayModeRef) CFArrayGetValueAtIndex(allModes, i);
+                            if (CGDisplayModeGetPixelWidth(modeInfo) == preferredWidth && CGDisplayModeGetPixelHeight(modeInfo) == preferredHeight)
+                            {
+                                double rr = CGDisplayModeGetRefreshRate(modeInfo);
+                                if (rr > preferredRefreshRate) preferredRefreshRate = rr;
+                                break;
+                            }
+                        }
+                    }
+                }
             }
 
-            if (!physicalWidth || !physicalHeight)
+            if ((!physicalWidth || !physicalHeight) && CGDisplayPrimaryDisplay(screen) == screen) // #1406
             {
                 CGSize size = CGDisplayScreenSize(screen);
                 physicalWidth = (uint32_t) (size.width + 0.5);
@@ -91,6 +121,9 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 refreshRate,
                 (uint32_t)CGDisplayModeGetWidth(mode),
                 (uint32_t)CGDisplayModeGetHeight(mode),
+                preferredWidth,
+                preferredHeight,
+                preferredRefreshRate,
                 (uint32_t)CGDisplayRotation(screen),
                 &buffer,
                 CGDisplayIsBuiltin(screen) ? FF_DISPLAY_TYPE_BUILTIN : FF_DISPLAY_TYPE_EXTERNAL,
@@ -117,7 +150,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 }
                 #endif
 
-                if (display->type == FF_DISPLAY_TYPE_BUILTIN)
+                if (display->type == FF_DISPLAY_TYPE_BUILTIN && displayInfo)
                     display->hdrStatus = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance"))
                         ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
                 #ifdef MAC_OS_X_VERSION_10_15
@@ -135,11 +168,15 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 #endif
 
                 display->serial = CGDisplaySerialNumber(screen);
-                int value;
+
-                if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayYearOfManufacture), &value) == NULL)
+                if (displayInfo)
-                    display->manufactureYear = (uint16_t) value;
+                {
-                if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayWeekOfManufacture), &value) == NULL)
+                    int value;
-                    display->manufactureWeek = (uint16_t) value;
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayYearOfManufacture), &value) == NULL)
+                        display->manufactureYear = (uint16_t) value;
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayWeekOfManufacture), &value) == NULL)
+                        display->manufactureWeek = (uint16_t) value;
+                }
             }
             CGDisplayModeRelease(mode);
         }

src/detection/displayserver/displayserver_windows.c

@@ -149,12 +149,30 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 default: rotation = 0; break;
             }
 
+            DISPLAYCONFIG_TARGET_PREFERRED_MODE preferredMode = {
+                .header = {
+                    .type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE,
+                    .size = sizeof(preferredMode),
+                    .adapterId = path->targetInfo.adapterId,
+                    .id = path->targetInfo.id,
+                }
+            };
+            double preferredRefreshRate = 0;
+            if (DisplayConfigGetDeviceInfo(&preferredMode.header) == ERROR_SUCCESS)
+            {
+                DISPLAYCONFIG_RATIONAL freq = preferredMode.targetMode.targetVideoSignalInfo.vSyncFreq;
+                preferredRefreshRate = freq.Numerator / (double) freq.Denominator;
+            }
+
             FFDisplayResult* display = ffdsAppendDisplay(ds,
                 width,
                 height,
                 path->targetInfo.refreshRate.Numerator / (double) path->targetInfo.refreshRate.Denominator,
                 (uint32_t) (monitorInfo->info.rcMonitor.right - monitorInfo->info.rcMonitor.left),
                 (uint32_t) (monitorInfo->info.rcMonitor.bottom - monitorInfo->info.rcMonitor.top),
+                preferredMode.width,
+                preferredMode.height,
+                preferredRefreshRate,
                 rotation,
                 &name,
                 path->targetInfo.outputTechnology == DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER ? FF_DISPLAY_TYPE_UNKNOWN :
@@ -218,19 +236,24 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
 
     //https://github.com/hykilpikonna/hyfetch/blob/master/neofetch#L2067
     const FFOSResult* os = ffDetectOS();
-    if(
+    uint32_t ver = (uint32_t) ffStrbufToUInt(&os->version, 0);
-        ffStrbufEqualS(&os->version, "11") ||
+    if (ver > 1000)
-        ffStrbufEqualS(&os->version, "10") ||
+    {
-        ffStrbufEqualS(&os->version, "2022") ||
+        // Windows Server
-        ffStrbufEqualS(&os->version, "2019") ||
+        if (ver >= 2016)
-        ffStrbufEqualS(&os->version, "2016")
+            ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
-    ) ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
+        else if (ver >= 2012)
-    else if(
+            ffStrbufSetStatic(&ds->dePrettyName, "Metro");
-        ffStrbufEqualS(&os->version, "8") ||
+        else
-        ffStrbufEqualS(&os->version, "8.1") ||
+            ffStrbufSetStatic(&ds->dePrettyName, "Aero");
-        ffStrbufEqualS(&os->version, "2012 R2") ||
+    }
-        ffStrbufEqualS(&os->version, "2012")
-    ) ffStrbufSetStatic(&ds->dePrettyName, "Metro");
     else
-        ffStrbufSetStatic(&ds->dePrettyName, "Aero");
+    {
+        if (ver >= 10)
+            ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
+        else if (ver >= 8)
+            ffStrbufSetStatic(&ds->dePrettyName, "Metro");
+        else
+            ffStrbufSetStatic(&ds->dePrettyName, "Aero");
+    }
 }

src/detection/displayserver/linux/displayserver_linux.c

@@ -54,18 +54,11 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
         //Try the x11 libs, from most feature rich to least.
         //We use the display list to detect if a connection is needed.
         //They respect wmProtocolName, and only detect display if it is set.
-
         if(ds->displays.length == 0)
             ffdsConnectXcbRandr(ds);
 
         if(ds->displays.length == 0)
             ffdsConnectXrandr(ds);
-
-        if(ds->displays.length == 0)
-            ffdsConnectXcb(ds);
-
-        if(ds->displays.length == 0)
-            ffdsConnectXlib(ds);
     }
 
     //This display detection method is display server independent.
@@ -86,7 +79,7 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
                 if (ffSettingsGetFreeBSDKenv("screen.height", &buf))
                 {
                     uint32_t height = (uint32_t) ffStrbufToUInt(&buf, 0);
-                    ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0, "kenv");
+                    ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0, "kenv");
                 }
             }
         }

src/detection/displayserver/linux/displayserver_linux.h

@@ -5,11 +5,7 @@
 const char* ffdsConnectWayland(FFDisplayServerResult* result);
 
 const char* ffdsConnectXcbRandr(FFDisplayServerResult* result);
-const char* ffdsConnectXcb(FFDisplayServerResult* result);
-
 const char* ffdsConnectXrandr(FFDisplayServerResult* result);
-const char* ffdsConnectXlib(FFDisplayServerResult* result);
-
 const char* ffdsConnectDrm(FFDisplayServerResult* result);
 
 void ffdsDetectWMDE(FFDisplayServerResult* result);

src/detection/displayserver/linux/drm.c

@@ -84,6 +84,8 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)
             width, height,
             refreshRate,
             0, 0,
+            0, 0,
+            0,
             0,
             &name,
             ffdsGetDisplayType(plainName),
@@ -218,12 +220,14 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetConnectorCurrent)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetCrtc)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetEncoder)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetFB)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetProperty)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetPropertyBlob)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeResources)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeCrtc)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeEncoder)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeConnector)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeEncoder)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeFB)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreeProperty)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeFreePropertyBlob)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmFreeDevices)
@@ -252,28 +256,29 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
             continue;
         #endif
 
-        FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY | O_CLOEXEC);
+        FF_AUTO_CLOSE_FD int primaryFd = open(path, O_RDWR | O_CLOEXEC);
-        if (fd < 0)
+        if (primaryFd < 0)
             continue;
 
-        drmModeRes* res = ffdrmModeGetResources(fd);
+        drmModeRes* res = ffdrmModeGetResources(primaryFd);
         if (!res)
             continue;
 
         for (int iConn = 0; iConn < res->count_connectors; ++iConn)
         {
-            drmModeConnector* conn = ffdrmModeGetConnectorCurrent(fd, res->connectors[iConn]);
+            drmModeConnector* conn = ffdrmModeGetConnectorCurrent(primaryFd, res->connectors[iConn]);
             if (!conn)
                 continue;
 
             if (conn->connection != DRM_MODE_DISCONNECTED)
             {
-                drmModeEncoder* encoder = ffdrmModeGetEncoder(fd, conn->encoder_id);
+                drmModeEncoder* encoder = ffdrmModeGetEncoder(primaryFd, conn->encoder_id);
                 uint32_t width = 0, height = 0, refreshRate = 0;
+                uint8_t bitDepth = 0;
 
                 if (encoder)
                 {
-                    drmModeCrtc* crtc = ffdrmModeGetCrtc(fd, encoder->crtc_id);
+                    drmModeCrtc* crtc = ffdrmModeGetCrtc(primaryFd, encoder->crtc_id);
                     if (crtc)
                     {
                         width = crtc->mode.hdisplay;
@@ -292,28 +297,42 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
                                 }
                             }
                         }
+
+                        drmModeFBPtr fb = ffdrmModeGetFB(primaryFd, crtc->buffer_id);
+                        if (fb)
+                        {
+                            bitDepth = (uint8_t) (fb->depth / 3);
+                            ffdrmModeFreeFB(fb);
+                        }
+
                         ffdrmModeFreeCrtc(crtc);
                     }
 
                     ffdrmModeFreeEncoder(encoder);
                 }
 
+                uint32_t preferredWidth = 0, preferredHeight = 0, preferredRefreshRate = 0;
+
+                for (int iMode = 0; iMode < conn->count_modes; ++iMode)
+                {
+                    drmModeModeInfo* mode = &conn->modes[iMode];
+
+                    if (mode->type & DRM_MODE_TYPE_PREFERRED)
+                    {
+                        preferredWidth = mode->hdisplay;
+                        preferredHeight = mode->vdisplay;
+                        preferredRefreshRate = mode->vrefresh;
+                        break;
+                    }
+                }
+
+                // NVIDIA DRM driver seems incomplete and conn->encoder_id == 0
+                // Assume preferred resolution is used as what we do in drmParseSys
                 if (width == 0 || height == 0)
                 {
-                    // NVIDIA DRM driver seems incomplete and conn->encoder_id == 0
+                    width = preferredWidth;
-                    // Assume preferred resolution is used as what we do in drmParseSys
+                    height = preferredHeight;
-                    for (int iMode = 0; iMode < conn->count_modes; ++iMode)
+                    refreshRate = preferredRefreshRate;
-                    {
-                        drmModeModeInfo* mode = &conn->modes[iMode];
-
-                        if (mode->type & DRM_MODE_TYPE_PREFERRED)
-                        {
-                            width = mode->hdisplay;
-                            height = mode->vdisplay;
-                            refreshRate = mode->vrefresh;
-                            break;
-                        }
-                    }
                 }
 
 
@@ -324,7 +343,7 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
 
                 for (int iProp = 0; iProp < conn->count_props; ++iProp)
                 {
-                    drmModePropertyRes *prop = ffdrmModeGetProperty(fd, conn->props[iProp]);
+                    drmModePropertyRes *prop = ffdrmModeGetProperty(primaryFd, conn->props[iProp]);
                     if (!prop)
                         continue;
 
@@ -334,9 +353,9 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
                         drmModePropertyBlobPtr blob = NULL;
 
                         if (prop->count_blobs > 0 && prop->blob_ids != NULL)
-                            blob = ffdrmModeGetPropertyBlob(fd, prop->blob_ids[0]);
+                            blob = ffdrmModeGetPropertyBlob(primaryFd, prop->blob_ids[0]);
                         else
-                            blob = ffdrmModeGetPropertyBlob(fd, (uint32_t) conn->prop_values[iProp]);
+                            blob = ffdrmModeGetPropertyBlob(primaryFd, (uint32_t) conn->prop_values[iProp]);
 
                         if (blob)
                         {
@@ -382,6 +401,9 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
                     refreshRate,
                     0,
                     0,
+                    preferredWidth,
+                    preferredHeight,
+                    preferredRefreshRate,
                     0,
                     &name,
                     conn->connector_type == DRM_MODE_CONNECTOR_eDP || conn->connector_type == DRM_MODE_CONNECTOR_LVDS
@@ -401,6 +423,7 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
                     item->serial = serial;
                     item->manufactureYear = myear;
                     item->manufactureWeek = mweak;
+                    item->bitDepth = bitDepth;
                 }
             }
 

src/detection/displayserver/linux/wayland/global-output.c

@@ -6,13 +6,20 @@
 
 static void waylandOutputModeListener(void* data, FF_MAYBE_UNUSED struct wl_output* output, uint32_t flags, int32_t width, int32_t height, int32_t refreshRate)
 {
-    if(!(flags & WL_OUTPUT_MODE_CURRENT))
-        return;
-
     WaylandDisplay* display = data;
-    display->width = width;
+
-    display->height = height;
+    if (flags & WL_OUTPUT_MODE_CURRENT)
-    display->refreshRate = refreshRate;
+    {
+        display->width = width;
+        display->height = height;
+        display->refreshRate = refreshRate;
+    }
+    if (flags & WL_OUTPUT_MODE_PREFERRED)
+    {
+        display->preferredWidth = width;
+        display->preferredHeight = height;
+        display->preferredRefreshRate = refreshRate;
+    }
 }
 
 static void waylandOutputScaleListener(void* data, FF_MAYBE_UNUSED struct wl_output* output, int32_t scale)
@@ -79,9 +86,6 @@ void ffWaylandHandleGlobalOutput(WaylandData* wldata, struct wl_registry* regist
 
     WaylandDisplay display = {
         .parent = wldata,
-        .width = 0,
-        .height = 0,
-        .refreshRate = 0,
         .scale = 1,
         .transform = WL_OUTPUT_TRANSFORM_NORMAL,
         .type = FF_DISPLAY_TYPE_UNKNOWN,
@@ -118,6 +122,9 @@ void ffWaylandHandleGlobalOutput(WaylandData* wldata, struct wl_registry* regist
         display.refreshRate / 1000.0,
         (uint32_t) (display.width / display.scale),
         (uint32_t) (display.height / display.scale),
+        (uint32_t) display.preferredWidth,
+        (uint32_t) display.preferredHeight,
+        display.preferredRefreshRate / 1000.0,
         rotation,
         display.edidName.length
             ? &display.edidName

src/detection/displayserver/linux/wayland/kde-output.c

@@ -11,26 +11,33 @@ typedef struct WaylandKdeMode
     int32_t width;
     int32_t height;
     int32_t refreshRate;
+    bool preferred;
     struct kde_output_device_mode_v2* pMode;
 } WaylandKdeMode;
 
-static void waylandKdeSizeListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_mode_v2 *_, int32_t width, int32_t height)
+static void waylandKdeModeSizeListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_mode_v2 *_, int32_t width, int32_t height)
 {
     WaylandKdeMode* mode = (WaylandKdeMode*) data;
     mode->width = width;
     mode->height = height;
 }
 
-static void waylandKdeRefreshListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_mode_v2 *_, int32_t rate)
+static void waylandKdeModeRefreshListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_mode_v2 *_, int32_t rate)
 {
     WaylandKdeMode* mode = (WaylandKdeMode*) data;
     mode->refreshRate = rate;
 }
 
+static void waylandKdeModePreferredListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_mode_v2 *_)
+{
+    WaylandKdeMode* mode = (WaylandKdeMode*) data;
+    mode->preferred = true;
+}
+
 static const struct kde_output_device_mode_v2_listener modeListener = {
-    .size = waylandKdeSizeListener,
+    .size = waylandKdeModeSizeListener,
-    .refresh = waylandKdeRefreshListener,
+    .refresh = waylandKdeModeRefreshListener,
-    .preferred = (void*) stubListener,
+    .preferred = waylandKdeModePreferredListener,
     .removed = (void*) stubListener,
 };
 
@@ -40,7 +47,7 @@ static void waylandKdeModeListener(void* data, FF_MAYBE_UNUSED struct kde_output
     if (!wldata->internal) return;
 
     WaylandKdeMode* newMode = ffListAdd((FFlist*) wldata->internal);
-    newMode->pMode = mode;
+    *newMode = (WaylandKdeMode) { .pMode = mode };
 
     // Strangely, the listener is called only in this function, but not in `waylandKdeCurrentModeListener`
     wldata->parent->ffwl_proxy_add_listener((struct wl_proxy *) mode, (void (**)(void)) &modeListener, newMode);
@@ -52,18 +59,24 @@ static void waylandKdeCurrentModeListener(void* data, FF_MAYBE_UNUSED struct kde
     WaylandDisplay* wldata = (WaylandDisplay*) data;
     if (!wldata->internal) return;
 
-    WaylandKdeMode* current = NULL;
+    int set = 0;
     FF_LIST_FOR_EACH(WaylandKdeMode, m, *(FFlist*) wldata->internal)
     {
         if (m->pMode == mode)
         {
-            current = m;
+            wldata->width = m->width;
-            break;
+            wldata->height = m->height;
+            wldata->refreshRate = m->refreshRate;
+            if (++set == 2) break;
+        }
+        if (m->preferred)
+        {
+            wldata->preferredWidth = m->width;
+            wldata->preferredHeight = m->height;
+            wldata->preferredRefreshRate = m->refreshRate;
+            if (++set == 2) break;
         }
     }
-    wldata->width = current->width;
-    wldata->height = current->height;
-    wldata->refreshRate = current->refreshRate;
 }
 
 static void waylandKdeScaleListener(void* data, FF_MAYBE_UNUSED struct kde_output_device_v2* _, wl_fixed_t scale)
@@ -113,10 +126,7 @@ static void waylandKdeNameListener(void* data, FF_MAYBE_UNUSED struct kde_output
     WaylandDisplay* display = data;
     display->type = ffdsGetDisplayType(name);
     // As display->id is used as an internal identifier, we don't need it to be NUL terminated
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wstringop-truncation"
     strncpy((char*) &display->id, name, sizeof(display->id));
-    #pragma GCC diagnostic pop
 
     ffStrbufAppendS(&display->name, name);
 }
@@ -164,9 +174,6 @@ void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry,
     FF_LIST_AUTO_DESTROY modes = ffListCreate(sizeof(WaylandKdeMode));
     WaylandDisplay display = {
         .parent = wldata,
-        .width = 0,
-        .height = 0,
-        .refreshRate = 0,
         .scale = 1,
         .transform = WL_OUTPUT_TRANSFORM_NORMAL,
         .type = FF_DISPLAY_TYPE_UNKNOWN,
@@ -191,6 +198,9 @@ void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry,
         display.refreshRate / 1000.0,
         (uint32_t) (display.width / display.scale),
         (uint32_t) (display.height / display.scale),
+        (uint32_t) display.preferredWidth,
+        (uint32_t) display.preferredHeight,
+        display.preferredRefreshRate / 1000.0,
         rotation,
         display.edidName.length
             ? &display.edidName

src/detection/displayserver/linux/wayland/wayland.c

@@ -18,10 +18,18 @@
 #include "kde-output-order-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
-#ifdef __linux__
+#if __FreeBSD__
+#include <sys/un.h>
+#include <sys/ucred.h>
+#include <sys/sysctl.h>
+#endif
+
 static bool waylandDetectWM(int fd, FFDisplayServerResult* result)
 {
-    struct ucred ucred;
+#if __linux__ || (__FreeBSD__ && !__DragonFly__)
+
+#if __linux
+    struct ucred ucred = {};
     socklen_t len = sizeof(ucred);
     if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == -1 || ucred.pid <= 0)
         return false;
@@ -30,6 +38,19 @@ static bool waylandDetectWM(int fd, FFDisplayServerResult* result)
     ffStrbufAppendF(&procPath, "/proc/%d/cmdline", ucred.pid); //We check the cmdline for the process name, because it is not trimmed.
     if (!ffReadFileBuffer(procPath.chars, &result->wmProcessName))
         return false;
+#else
+    struct xucred ucred = {};
+    socklen_t len = sizeof(ucred);
+    if (getsockopt(fd, AF_UNSPEC, LOCAL_PEERCRED, &ucred, &len) == -1 || ucred.cr_pid <= 0)
+        return false;
+
+    size_t size = 4096;
+    ffStrbufEnsureFixedLengthFree(&result->wmProcessName, (uint32_t) size);
+
+    if(sysctl((int[]){CTL_KERN, KERN_PROC, KERN_PROC_ARGS, ucred.cr_pid}, 4, result->wmProcessName.chars, &size, NULL, 0 ) != 0)
+        return false;
+    result->wmProcessName.length = (uint32_t) size - 1;
+#endif
 
     // #1135: wl-restart is a special case
     const char* filename = strrchr(result->wmProcessName.chars, '/');
@@ -39,20 +60,18 @@ static bool waylandDetectWM(int fd, FFDisplayServerResult* result)
         filename = result->wmProcessName.chars;
 
     if (ffStrEquals(filename, "wl-restart"))
-        ffStrbufSubstrAfterFirstC(&result->wmProcessName, '\0');
+        ffStrbufSubstrAfterLastC(&result->wmProcessName, '\0');
 
     ffStrbufSubstrBeforeFirstC(&result->wmProcessName, '\0'); //Trim the arguments
     ffStrbufSubstrAfterLastC(&result->wmProcessName, '/'); //Trim the path
 
     return true;
-}
+
 #else
-static bool waylandDetectWM(int fd, FFDisplayServerResult* result)
-{
     FF_UNUSED(fd, result);
     return false;
-}
 #endif
+}
 
 static void waylandGlobalAddListener(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version)
 {
@@ -83,7 +102,7 @@ static void waylandGlobalAddListener(void* data, struct wl_registry* registry, u
     }
 }
 
-static bool matchDrmConnector(const char* connName, WaylandDisplay* wldata)
+static FF_MAYBE_UNUSED bool matchDrmConnector(const char* connName, WaylandDisplay* wldata)
 {
     // https://wayland.freedesktop.org/docs/html/apa.html#protocol-spec-wl_output-event-name
     // The doc says that "do not assume that the name is a reflection of an underlying DRM connector, X11 connection, etc."
@@ -129,8 +148,10 @@ void ffWaylandOutputNameListener(void* data, FF_MAYBE_UNUSED void* output, const
     if (display->id) return;
 
     display->type = ffdsGetDisplayType(name);
+    #if __linux__
     if (!display->edidName.length)
         matchDrmConnector(name, display);
+    #endif
     display->id = ffWaylandGenerateIdFromName(name);
     ffStrbufAppendS(&display->name, name);
 }

src/detection/displayserver/linux/wayland/wayland.h

@@ -36,9 +36,12 @@ typedef struct WaylandDisplay
     WaylandData* parent;
     int32_t width;
     int32_t height;
+    int32_t refreshRate;
+    int32_t preferredWidth;
+    int32_t preferredHeight;
+    int32_t preferredRefreshRate;
     int32_t physicalWidth;
     int32_t physicalHeight;
-    int32_t refreshRate;
     double scale;
     enum wl_output_transform transform;
     FFDisplayType type;

src/detection/displayserver/linux/wayland/zwlr-output.c

@@ -20,34 +20,43 @@ typedef struct WaylandZwlrMode
     int32_t width;
     int32_t height;
     int32_t refreshRate;
+    bool preferred;
     struct zwlr_output_mode_v1* pMode;
 } WaylandZwlrMode;
 
-static void waylandZwlrSizeListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_mode_v1 *zwlr_output_mode_v1, int32_t width, int32_t height)
+static void waylandZwlrModeSizeListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_mode_v1 *zwlr_output_mode_v1, int32_t width, int32_t height)
 {
     WaylandZwlrMode* mode = (WaylandZwlrMode*) data;
     mode->width = width;
     mode->height = height;
 }
 
-static void waylandZwlrRefreshListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_mode_v1 *zwlr_output_mode_v1, int32_t rate)
+static void waylandZwlrModeRefreshListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_mode_v1 *zwlr_output_mode_v1, int32_t rate)
 {
     WaylandZwlrMode* mode = (WaylandZwlrMode*) data;
     mode->refreshRate = rate;
 }
 
+static void waylandZwlrModePreferredListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_mode_v1 *zwlr_output_mode_v1)
+{
+    WaylandZwlrMode* mode = (WaylandZwlrMode*) data;
+    mode->preferred = true;
+}
+
 static const struct zwlr_output_mode_v1_listener modeListener = {
-    .size = waylandZwlrSizeListener,
+    .size = waylandZwlrModeSizeListener,
-    .refresh = waylandZwlrRefreshListener,
+    .refresh = waylandZwlrModeRefreshListener,
-    .preferred = (void*) stubListener,
+    .preferred = waylandZwlrModePreferredListener,
     .finished = (void*) stubListener,
 };
 
 static void waylandZwlrModeListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_head_v1 *zwlr_output_head_v1, struct zwlr_output_mode_v1 *mode)
 {
     WaylandDisplay* wldata = (WaylandDisplay*) data;
+    if (!wldata->internal) return;
+
     WaylandZwlrMode* newMode = ffListAdd((FFlist*) wldata->internal);
-    newMode->pMode = mode;
+    *newMode = (WaylandZwlrMode) { .pMode = mode };
 
     // Strangely, the listener is called only in this function, but not in `waylandZwlrCurrentModeListener`
     wldata->parent->ffwl_proxy_add_listener((struct wl_proxy *) mode, (void (**)(void)) &modeListener, newMode);
@@ -57,18 +66,26 @@ static void waylandZwlrCurrentModeListener(void* data, FF_MAYBE_UNUSED struct zw
 {
     // waylandZwlrModeListener is always run before this
     WaylandDisplay* wldata = (WaylandDisplay*) data;
-    WaylandZwlrMode* current = NULL;
+    if (!wldata->internal) return;
+
+    int set = 0;
     FF_LIST_FOR_EACH(WaylandZwlrMode, m, *(FFlist*) wldata->internal)
     {
         if (m->pMode == mode)
         {
-            current = m;
+            wldata->width = m->width;
-            break;
+            wldata->height = m->height;
+            wldata->refreshRate = m->refreshRate;
+            if (++set == 2) break;
+        }
+        if (m->preferred)
+        {
+            wldata->preferredWidth = m->width;
+            wldata->preferredHeight = m->height;
+            wldata->preferredRefreshRate = m->refreshRate;
+            if (++set == 2) break;
         }
     }
-    wldata->width = current->width;
-    wldata->height = current->height;
-    wldata->refreshRate = current->refreshRate;
 }
 
 static void waylandZwlrPhysicalSizeListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_head_v1 *zwlr_output_head_v1, int32_t width, int32_t height)
@@ -78,12 +95,18 @@ static void waylandZwlrPhysicalSizeListener(void* data, FF_MAYBE_UNUSED struct z
     wldata->physicalHeight = height;
 }
 
+static void waylandZwlrEnabledListener(void* data, FF_MAYBE_UNUSED struct zwlr_output_head_v1 *zwlr_output_head_v1, bool enabled)
+{
+    WaylandDisplay* wldata = (WaylandDisplay*) data;
+    if (!enabled) wldata->internal = NULL;
+}
+
 static const struct zwlr_output_head_v1_listener headListener = {
     .name = (void*) ffWaylandOutputNameListener,
     .description = (void*) ffWaylandOutputDescriptionListener,
     .physical_size = waylandZwlrPhysicalSizeListener,
     .mode = waylandZwlrModeListener,
-    .enabled = (void*) stubListener,
+    .enabled = (void*) waylandZwlrEnabledListener,
     .current_mode = waylandZwlrCurrentModeListener,
     .position = (void*) stubListener,
     .transform = waylandZwlrTransformListener,
@@ -102,9 +125,6 @@ static void waylandHandleZwlrHead(void *data, FF_MAYBE_UNUSED struct zwlr_output
     FF_LIST_AUTO_DESTROY modes = ffListCreate(sizeof(WaylandZwlrMode));
     WaylandDisplay display = {
         .parent = wldata,
-        .width = 0,
-        .height = 0,
-        .refreshRate = 0,
         .scale = 1,
         .transform = WL_OUTPUT_TRANSFORM_NORMAL,
         .type = FF_DISPLAY_TYPE_UNKNOWN,
@@ -117,7 +137,7 @@ static void waylandHandleZwlrHead(void *data, FF_MAYBE_UNUSED struct zwlr_output
     wldata->ffwl_proxy_add_listener((struct wl_proxy*) head, (void(**)(void)) &headListener, &display);
     wldata->ffwl_display_roundtrip(wldata->display);
 
-    if(display.width <= 0 || display.height <= 0)
+    if(display.width <= 0 || display.height <= 0 || !display.internal)
         return;
 
     uint32_t rotation = ffWaylandHandleRotation(&display);
@@ -128,6 +148,9 @@ static void waylandHandleZwlrHead(void *data, FF_MAYBE_UNUSED struct zwlr_output
         display.refreshRate / 1000.0,
         (uint32_t) (display.width / display.scale + 0.5),
         (uint32_t) (display.height / display.scale + 0.5),
+        (uint32_t) display.preferredWidth,
+        (uint32_t) display.preferredHeight,
+        display.preferredRefreshRate / 1000.0,
         rotation,
         display.edidName.length
             ? &display.edidName

src/detection/displayserver/linux/wmde.c

@@ -126,8 +126,14 @@ static void applyPrettyNameIfWM(FFDisplayServerResult* result, const char* name)
         ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_ICEWM);
     else if(ffStrEqualsIgnCase(name, "dtwm"))
         ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_DTWM);
+    else if(ffStrEqualsIgnCase(name, "fvwm"))
+        ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_FVWM);
+    else if(ffStrEqualsIgnCase(name, "ctwm"))
+        ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_CTWM);
     else if(ffStrEqualsIgnCase(name, "hyprland"))
         ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_HYPRLAND);
+    else if(ffStrEqualsIgnCase(name, "ratpoison"))
+        ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_RATPOISON);
 }
 
 static void applyNameIfWM(FFDisplayServerResult* result, const char* processName)
@@ -296,10 +302,10 @@ static const char* getFromProcesses(FFDisplayServerResult* result)
         for (int i = 0; i < count; ++i)
         {
             if(result->dePrettyName.length == 0)
-                applyPrettyNameIfDE(result, proc->p_comm);
+                applyPrettyNameIfDE(result, proc[i].p_comm);
 
             if(result->wmPrettyName.length == 0)
-                applyNameIfWM(result, proc->p_comm);
+                applyNameIfWM(result, proc[i].p_comm);
 
             if(result->dePrettyName.length > 0 && result->wmPrettyName.length > 0)
                 break;

src/detection/displayserver/linux/xcb.c

@@ -1,11 +1,15 @@
 #include "displayserver_linux.h"
-#include "util/mallocHelper.h"
-#include "common/time.h"
 
-#ifdef FF_HAVE_XCB
+#ifdef FF_HAVE_XCB_RANDR
+
 #include "common/library.h"
+#include "common/time.h"
+#include "util/edidHelper.h"
+#include "util/mallocHelper.h"
+
 #include <stdlib.h>
 #include <string.h>
+#include <xcb/randr.h>
 #include <xcb/xcb.h>
 
 typedef struct XcbPropertyData
@@ -82,72 +86,6 @@ static void xcbDetectWMfromEWMH(XcbPropertyData* data, xcb_connection_t* connect
     ffStrbufSetS(&result->wmProcessName, wmName);
 }
 
-const char* ffdsConnectXcb(FFDisplayServerResult* result)
-{
-    FF_LIBRARY_LOAD(xcb, "dlopen lbxcb failed", "libxcb" FF_LIBRARY_EXTENSION, 2)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcb, xcb_connect)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcb, xcb_get_setup)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcb, xcb_setup_roots_iterator)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcb, xcb_screen_next)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcb, xcb_disconnect)
-
-    XcbPropertyData propertyData;
-    bool propertyDataInitialized = xcbInitPropertyData(xcb, &propertyData);
-
-    xcb_connection_t* connection = ffxcb_connect(NULL, NULL);
-    if(connection == NULL)
-        return "xcb_connect failed";
-
-    xcb_screen_iterator_t iterator = ffxcb_setup_roots_iterator(ffxcb_get_setup(connection));
-
-    if(iterator.rem > 0 && propertyDataInitialized)
-        xcbDetectWMfromEWMH(&propertyData, connection, iterator.data->root, result);
-
-    while(iterator.rem > 0)
-    {
-        xcb_screen_t* screen = iterator.data;
-        ffdsAppendDisplay(result,
-            (uint32_t) screen->width_in_pixels,
-            (uint32_t) screen->height_in_pixels,
-            0,
-            (uint32_t) screen->width_in_pixels,
-            (uint32_t) screen->height_in_pixels,
-            0,
-            NULL,
-            FF_DISPLAY_TYPE_UNKNOWN,
-            false,
-            0,
-            (uint32_t) screen->width_in_millimeters,
-            (uint32_t) screen->height_in_millimeters,
-            "xcb"
-        );
-        ffxcb_screen_next(&iterator);
-    }
-
-    ffxcb_disconnect(connection);
-
-    //If wayland hasn't set this, connection failed for it. So we are running only a X Server, not XWayland.
-    if(result->wmProtocolName.length == 0)
-        ffStrbufSetS(&result->wmProtocolName, FF_WM_PROTOCOL_X11);
-
-    return NULL;
-}
-
-#else
-
-const char* ffdsConnectXcb(FFDisplayServerResult* result)
-{
-    //Do nothing. There are other implementations coming
-    FF_UNUSED(result)
-    return "Fastfetch was compiled without XCB support";
-}
-
-#endif
-
-#ifdef FF_HAVE_XCB_RANDR
-#include "util/edidHelper.h"
-#include <xcb/randr.h>
-
 typedef struct XcbRandrData
 {
     FF_LIBRARY_SYMBOL(xcb_randr_get_screen_resources_current)
@@ -181,28 +119,6 @@ typedef struct XcbRandrData
     xcb_randr_get_screen_resources_current_reply_t* screenResources;
 } XcbRandrData;
 
-static double xcbRandrHandleMode(XcbRandrData* data, xcb_randr_mode_t mode)
-{
-    //We do the check here, because we want the best fallback display if this call failed
-    if(data->screenResources == NULL)
-        return 0;
-
-    xcb_randr_mode_info_iterator_t modesIterator = data->ffxcb_randr_get_screen_resources_current_modes_iterator(data->screenResources);
-
-    while(modesIterator.rem > 0)
-    {
-        if(modesIterator.data->id == mode)
-        {
-            xcb_randr_mode_info_t* modeInfo = modesIterator.data;
-            return (double) modeInfo->dot_clock / (double) (modeInfo->htotal * modeInfo->vtotal);
-        }
-
-        data->ffxcb_randr_mode_info_next(&modesIterator);
-    }
-
-    return 0;
-}
-
 static bool xcbRandrHandleCrtc(XcbRandrData* data, xcb_randr_crtc_t crtc, FFstrbuf* name, bool primary, xcb_randr_get_output_info_reply_t* output, FFDisplayType displayType, uint8_t* edidData, uint32_t edidLength)
 {
     xcb_randr_get_crtc_info_cookie_t crtcInfoCookie = data->ffxcb_randr_get_crtc_info(data->connection, crtc, XCB_CURRENT_TIME);
@@ -227,13 +143,38 @@ static bool xcbRandrHandleCrtc(XcbRandrData* data, xcb_randr_crtc_t crtc, FFstrb
             break;
     }
 
+    xcb_randr_mode_info_t* currentMode = NULL;
+    xcb_randr_mode_info_t* preferredMode = NULL;
+
+    if(data->screenResources)
+    {
+        xcb_randr_mode_info_iterator_t modesIterator = data->ffxcb_randr_get_screen_resources_current_modes_iterator(data->screenResources);
+
+        if (output->num_preferred > 0)
+            preferredMode = modesIterator.data;
+
+        while (modesIterator.rem > 0)
+        {
+            if (modesIterator.data->id == crtcInfoReply->mode)
+            {
+                currentMode = modesIterator.data;
+                break;
+            }
+
+            data->ffxcb_randr_mode_info_next(&modesIterator);
+        }
+    }
+
     FFDisplayResult* item = ffdsAppendDisplay(
         data->result,
         (uint32_t) crtcInfoReply->width,
         (uint32_t) crtcInfoReply->height,
-        xcbRandrHandleMode(data, crtcInfoReply->mode),
+        currentMode ? (double) currentMode->dot_clock / (double) ((uint32_t) currentMode->htotal * currentMode->vtotal) : 0,
         (uint32_t) crtcInfoReply->width,
         (uint32_t) crtcInfoReply->height,
+        preferredMode ? (uint32_t) preferredMode->width : 0,
+        preferredMode ? (uint32_t) preferredMode->height : 0,
+        preferredMode ? (double) preferredMode->dot_clock / (double) ((uint32_t) preferredMode->htotal * preferredMode->vtotal) : 0,
         rotation,
         name,
         displayType,
@@ -247,7 +188,6 @@ static bool xcbRandrHandleCrtc(XcbRandrData* data, xcb_randr_crtc_t crtc, FFstrb
     {
         item->hdrStatus = ffEdidGetHdrCompatible(edidData, (uint32_t) edidLength) ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
         ffEdidGetSerialAndManufactureDate(edidData, &item->serial, &item->manufactureYear, &item->manufactureWeek);
-        ffEdidGetPhysicalSize(edidData, &item->physicalWidth, &item->physicalHeight);
     }
 
     return !!item;
@@ -323,6 +263,7 @@ static bool xcbRandrHandleMonitor(XcbRandrData* data, xcb_randr_monitor_info_t*
         0,
         (uint32_t) monitor->width,
         (uint32_t) monitor->height,
+        0, 0, 0,
         0,
         &name,
         displayType,
@@ -378,6 +319,7 @@ static void xcbRandrHandleScreen(XcbRandrData* data, xcb_screen_t* screen)
         0,
         (uint32_t) screen->width_in_pixels,
         (uint32_t) screen->height_in_pixels,
+        0, 0, 0,
         0,
         NULL,
         FF_DISPLAY_TYPE_UNKNOWN,

src/detection/displayserver/linux/xlib.c

@@ -1,9 +1,13 @@
 #include "displayserver_linux.h"
 
-#ifdef FF_HAVE_X11
+#ifdef FF_HAVE_XRANDR
+
 #include "common/library.h"
 #include "common/parsing.h"
+#include "util/edidHelper.h"
 #include "util/stringUtils.h"
+
+#include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 typedef struct X11PropertyData
@@ -58,66 +62,6 @@ static void x11DetectWMFromEWMH(X11PropertyData* data, Display* display, FFDispl
     data->ffXFree(wmWindow);
 }
 
-const char* ffdsConnectXlib(FFDisplayServerResult* result)
-{
-    FF_LIBRARY_LOAD(x11, "dlopen libX11 failed", "libX11" FF_LIBRARY_EXTENSION, 7, "libX11-xcb" FF_LIBRARY_EXTENSION, 2)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(x11, XOpenDisplay)
-    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(x11, XCloseDisplay)
-
-    X11PropertyData propertyData;
-    bool propertyDataInitialized = x11InitPropertyData(x11, &propertyData);
-
-    Display* display = ffXOpenDisplay(x11);
-    if(display == NULL)
-        return "XOpenDisplay failed";
-
-    if(propertyDataInitialized && ScreenCount(display) > 0)
-        x11DetectWMFromEWMH(&propertyData, display, result);
-
-    for(int i = 0; i < ScreenCount(display); i++)
-    {
-        Screen* screen = ScreenOfDisplay(display, i);
-        ffdsAppendDisplay(result,
-            (uint32_t) WidthOfScreen(screen),
-            (uint32_t) HeightOfScreen(screen),
-            0,
-            (uint32_t) WidthOfScreen(screen),
-            (uint32_t) HeightOfScreen(screen),
-            0,
-            NULL,
-            FF_DISPLAY_TYPE_UNKNOWN,
-            false,
-            0,
-            (uint32_t) WidthMMOfScreen(screen),
-            (uint32_t) HeightMMOfScreen(screen),
-            "xlib"
-        );
-    }
-
-    ffXCloseDisplay(display);
-
-    //If wayland hasn't set this, connection failed for it. So we are running only a X Server, not XWayland.
-    if(result->wmProtocolName.length == 0)
-        ffStrbufSetS(&result->wmProtocolName, FF_WM_PROTOCOL_X11);
-
-    return NULL;
-}
-
-#else
-
-const char* ffdsConnectXlib(FFDisplayServerResult* result)
-{
-    //Do nothing. WM / DE detection will use environment vars to detect as much as possible.
-    FF_UNUSED(result);
-    return "Fastfetch was compiled without libX11 support";
-}
-
-#endif //FF_HAVE_X11
-
-#ifdef FF_HAVE_XRANDR
-#include "util/edidHelper.h"
-#include <X11/extensions/Xrandr.h>
-
 typedef struct XrandrData
 {
     FF_LIBRARY_SYMBOL(XInternAtom)
@@ -141,19 +85,6 @@ typedef struct XrandrData
     XRRScreenResources* screenResources;
 } XrandrData;
 
-static double xrandrHandleMode(XrandrData* data, RRMode mode)
-{
-    for(int i = 0; i < data->screenResources->nmode; i++)
-    {
-        if(data->screenResources->modes[i].id == mode)
-        {
-            XRRModeInfo* modeInfo = &data->screenResources->modes[i];
-            return (double) modeInfo->dotClock / (double) (modeInfo->hTotal * modeInfo->vTotal);
-        }
-    }
-    return 0;
-}
-
 static bool xrandrHandleCrtc(XrandrData* data, XRROutputInfo* output, FFstrbuf* name, bool primary, FFDisplayType displayType, uint8_t* edidData, uint32_t edidLength)
 {
     //We do the check here, because we want the best fallback display if this call failed
@@ -181,13 +112,31 @@ static bool xrandrHandleCrtc(XrandrData* data, XRROutputInfo* output, FFstrbuf*
             break;
     }
 
+    XRRModeInfo* currentMode = NULL;
+    if (data->screenResources)
+    {
+        for(int i = 0; i < data->screenResources->nmode; i++)
+        {
+            if(data->screenResources->modes[i].id == crtcInfo->mode)
+            {
+                currentMode = &data->screenResources->modes[i];
+                break;
+            }
+        }
+    }
+
+    XRRModeInfo* preferredMode = data->screenResources && output->npreferred > 0 ? &data->screenResources->modes[0] : NULL;
+
     FFDisplayResult* item = ffdsAppendDisplay(
         data->result,
         (uint32_t) crtcInfo->width,
         (uint32_t) crtcInfo->height,
-        xrandrHandleMode(data, crtcInfo->mode),
+        currentMode ? (double) currentMode->dotClock / (double) ((uint32_t) currentMode->hTotal * currentMode->vTotal) : 0,
         (uint32_t) crtcInfo->width,
         (uint32_t) crtcInfo->height,
+        preferredMode ? (uint32_t) preferredMode->width : 0,
+        preferredMode ? (uint32_t) preferredMode->height : 0,
+        preferredMode ? (double) preferredMode->dotClock / (double) ((uint32_t) preferredMode->hTotal * preferredMode->vTotal) : 0,
         rotation,
         name,
         displayType,
@@ -202,7 +151,6 @@ static bool xrandrHandleCrtc(XrandrData* data, XRROutputInfo* output, FFstrbuf*
     {
         item->hdrStatus = ffEdidGetHdrCompatible(edidData, edidLength) ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
         ffEdidGetSerialAndManufactureDate(edidData, &item->serial, &item->manufactureYear, &item->manufactureWeek);
-        ffEdidGetPhysicalSize(edidData, &item->physicalWidth, &item->physicalHeight);
     }
 
     data->ffXRRFreeCrtcInfo(crtcInfo);
@@ -264,6 +212,7 @@ static bool xrandrHandleMonitor(XrandrData* data, XRRMonitorInfo* monitorInfo)
         0,
         (uint32_t) monitorInfo->width,
         (uint32_t) monitorInfo->height,
+        0, 0, 0,
         0,
         &name,
         displayType,
@@ -315,6 +264,7 @@ static void xrandrHandleScreen(XrandrData* data, Screen* screen)
         0,
         (uint32_t) WidthOfScreen(screen),
         (uint32_t) HeightOfScreen(screen),
+        0, 0, 0,
         0,
         NULL,
         FF_DISPLAY_TYPE_UNKNOWN,

src/detection/gpu/gpu_linux.c

@@ -536,27 +536,27 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
                 .name = &gpu->name,
             }, soName);
         }
-
-        if (gpu->type == FF_GPU_TYPE_UNKNOWN)
-        {
-            if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA)
-            {
-                if (ffStrbufStartsWithIgnCaseS(&gpu->name, "GeForce") ||
-                    ffStrbufStartsWithIgnCaseS(&gpu->name, "Quadro") ||
-                    ffStrbufStartsWithIgnCaseS(&gpu->name, "Tesla"))
-                    gpu->type = FF_GPU_TYPE_DISCRETE;
-            }
-            else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_MTHREADS)
-            {
-                if (ffStrbufStartsWithIgnCaseS(&gpu->name, "MTT "))
-                    gpu->type = FF_GPU_TYPE_DISCRETE;
-            }
-        }
     }
 
     if (gpu->name.length == 0)
         ffGPUFillVendorAndName(subclassId, (uint16_t) vendorId, (uint16_t) deviceId, gpu);
 
+    if (gpu->type == FF_GPU_TYPE_UNKNOWN)
+    {
+        if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA)
+        {
+            if (ffStrbufStartsWithIgnCaseS(&gpu->name, "GeForce") ||
+                ffStrbufStartsWithIgnCaseS(&gpu->name, "Quadro") ||
+                ffStrbufStartsWithIgnCaseS(&gpu->name, "Tesla"))
+                gpu->type = FF_GPU_TYPE_DISCRETE;
+        }
+        else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_MTHREADS)
+        {
+            if (ffStrbufStartsWithIgnCaseS(&gpu->name, "MTT "))
+                gpu->type = FF_GPU_TYPE_DISCRETE;
+        }
+    }
+
     return NULL;
 }
 

src/detection/gpu/gpu_pci.c

@@ -3,10 +3,14 @@
 
 #include <stdlib.h>
 #ifdef __FreeBSD__
-#include <paths.h>
+    #include <paths.h>
     #ifndef _PATH_LOCALBASE
         #define _PATH_LOCALBASE "/usr/local"
     #endif
+#elif __OpenBSD__
+    #define _PATH_LOCALBASE "/usr/local"
+#elif __NetBSD__
+    #define _PATH_LOCALBASE "/usr/pkg"
 #endif
 
 #if FF_HAVE_EMBEDDED_PCIIDS
@@ -37,17 +41,10 @@ static const FFstrbuf* loadPciIds()
             if (pciids.length == 0)
                 ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/local/share/hwdata/pci.ids", &pciids);
         }
-        #elif __FreeBSD__
+        #elif __FreeBSD__ || __OpenBSD__ || __NetBSD__
-        // https://github.com/freebsd/freebsd-src/blob/main/usr.sbin/pciconf/pathnames.h
         ffReadFileBuffer(_PATH_LOCALBASE "/share/pciids/pci.ids", &pciids);
-        if (pciids.length == 0)
-            ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/pciids/pci.ids", &pciids);
         #elif __sun
         ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/share/hwdata/pci.ids", &pciids);
-        #elif __OpenBSD__
-        ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/local/share/pci.ids", &pciids);
-        #elif __NetBSD__
-        ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/share/pciutils/pci.ids", &pciids);
         #endif
 
     #endif // FF_CUSTOM_PCI_IDS_PATH

src/detection/gpu/mtml.h

@@ -4,10 +4,8 @@
 // THIS FILE IS CREATED FROM SCRATCH, BY READING THE OFFICIAL MTML API
 // DOCUMENTATION REFERENCED BELOW, IN ORDER TO MAKE FASTFETCH MIT COMPLIANT.
 
-#define MTML_API __attribute__((visibility("default")))
 #define MTML_DEVICE_PCI_SBDF_BUFFER_SIZE 32
 #define MTML_DEVICE_NAME_BUFFER_SIZE 32
-#define MTML_DEVICE_UUID_BUFFER_SIZE 48
 
 /**
  * Return values for MTML API calls.
@@ -23,10 +21,6 @@ typedef enum
 typedef enum
 {
     MTML_BRAND_MTT = 0, //!< MTT series.
-    MTML_BRAND_UNKNOWN, //!< An unknown brand.
-
-    // Keep this on the last line.
-    MTML_BRAND_COUNT //!< The number of brands.
 } MtmlBrandType;
 
 typedef struct MtmlLibrary MtmlLibrary;
@@ -57,62 +51,62 @@ typedef struct
 } MtmlPciInfo;
 
 // Retrieves the number of cores of a device.
-MtmlReturn MTML_API mtmlDeviceCountGpuCores(const MtmlDevice* device, unsigned int* numCores);
+MtmlReturn mtmlDeviceCountGpuCores(const MtmlDevice* device, unsigned int* numCores);
 // Retrieves the brand of a device.
-MtmlReturn MTML_API mtmlDeviceGetBrand(const MtmlDevice *dev, MtmlBrandType *type);
+MtmlReturn mtmlDeviceGetBrand(const MtmlDevice *dev, MtmlBrandType *type);
 // Retrieves the index associated with the specified device.
-MtmlReturn MTML_API mtmlDeviceGetIndex(const MtmlDevice *dev, unsigned int *index);
+MtmlReturn mtmlDeviceGetIndex(const MtmlDevice *dev, unsigned int *index);
 // Retrieves the name of a device.
-MtmlReturn MTML_API mtmlDeviceGetName(const MtmlDevice *dev, char *name, unsigned int length);
+MtmlReturn mtmlDeviceGetName(const MtmlDevice *dev, char *name, unsigned int length);
 // Retrieves the PCI attributes of a device.
-MtmlReturn MTML_API mtmlDeviceGetPciInfo(const MtmlDevice *dev, MtmlPciInfo *pci);
+MtmlReturn mtmlDeviceGetPciInfo(const MtmlDevice *dev, MtmlPciInfo *pci);
 /**
  * Retrieves the UUID of a specified device. The UUID is a hexadecimal string in the
  * form of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx, where each 'x' is an ASCII character that represents a hexadecimal
  * digit. The UUID is globally unique for every single device thus can be used to identify different devices
  * physically.
  */
-MtmlReturn MTML_API mtmlDeviceGetUUID(const MtmlDevice *dev, char *uuid, unsigned int length);
+MtmlReturn mtmlDeviceGetUUID(const MtmlDevice *dev, char *uuid, unsigned int length);
 // Initializes a GPU opaque object to represent a specific graphic core on the target device that is designated by its index.
-MtmlReturn MTML_API mtmlDeviceInitGpu(const MtmlDevice *dev, MtmlGpu **gpu);
+MtmlReturn mtmlDeviceInitGpu(const MtmlDevice *dev, MtmlGpu **gpu);
 // Initializes a memory opaque object to represent the memory on the target device.
-MtmlReturn MTML_API mtmlDeviceInitMemory(const MtmlDevice *dev, MtmlMemory **mem);
+MtmlReturn mtmlDeviceInitMemory(const MtmlDevice *dev, MtmlMemory **mem);
 
 // Retrieves the maximum supported clock speed for the device's graphic core.
-MtmlReturn MTML_API mtmlGpuGetMaxClock(const MtmlGpu *gpu, unsigned int *clockMhz);
+MtmlReturn mtmlGpuGetMaxClock(const MtmlGpu *gpu, unsigned int *clockMhz);
 // Retrieves the current temperature readings for the device's graphic core, in degrees Celsius.
-MtmlReturn MTML_API mtmlGpuGetTemperature(const MtmlGpu *gpu, unsigned int *temp);
+MtmlReturn mtmlGpuGetTemperature(const MtmlGpu *gpu, unsigned int *temp);
 // Retrieves the current utilization rate for the device's graphic core.
-MtmlReturn MTML_API mtmlGpuGetUtilization(const MtmlGpu *gpu, unsigned int *utilization);
+MtmlReturn mtmlGpuGetUtilization(const MtmlGpu *gpu, unsigned int *utilization);
 
 // Retrieves the number of devices that can be accessed by the library opaque object.
-MtmlReturn MTML_API mtmlLibraryCountDevice(const MtmlLibrary *lib, unsigned int *count);
+MtmlReturn mtmlLibraryCountDevice(const MtmlLibrary *lib, unsigned int *count);
 /**
  * Initializes a device opaque object to represent a device that is designated by its index.
  * The index ranges from (0) to (deviceCount - 1), where deviceCount is retrieved from \ref mtmlLibraryCountDevice().
  */
-MtmlReturn MTML_API mtmlLibraryInit(MtmlLibrary **lib);
+MtmlReturn mtmlLibraryInit(MtmlLibrary **lib);
 /**
  * Initializes a device opaque object to represent a device that is designated by its index.
  * The index ranges from (0) to (deviceCount - 1), where deviceCount is retrieved from \ref mtmlLibraryCountDevice().
  */
-MtmlReturn MTML_API mtmlLibraryInitDeviceByIndex(const MtmlLibrary *lib, unsigned int index, MtmlDevice **dev);
+MtmlReturn mtmlLibraryInitDeviceByIndex(const MtmlLibrary *lib, unsigned int index, MtmlDevice **dev);
 /**
  * Initializes a device opaque object to represent a device that is designated by its PCI Sbdf.
  * The PCI Sbdf format like 00000000:3a:00.0 refer to \ref MtmlPciInfo::sbdf.
  */
-MtmlReturn MTML_API mtmlLibraryInitDeviceByPciSbdf(const MtmlLibrary *lib, const char *pciSbdf, MtmlDevice **dev);
+MtmlReturn mtmlLibraryInitDeviceByPciSbdf(const MtmlLibrary *lib, const char *pciSbdf, MtmlDevice **dev);
 // Initializes a MtmlSystem opaque pointer that is bound to a library opaque object.
-MtmlReturn MTML_API mtmlLibraryInitSystem(const MtmlLibrary *lib, MtmlSystem **sys);
+MtmlReturn mtmlLibraryInitSystem(const MtmlLibrary *lib, MtmlSystem **sys);
 /**
  * Shuts down the library opaque object that is previously initialized by \ref mtmlLibraryInit() and releases its resources.
  * The \a lib pointer cannot be used anymore after this function returns.
  */
-MtmlReturn MTML_API mtmlLibraryShutDown(MtmlLibrary *lib);
+MtmlReturn mtmlLibraryShutDown(MtmlLibrary *lib);
 
 // Retrieves the amount of total memory available on the device, in bytes.
-MtmlReturn MTML_API mtmlMemoryGetTotal(const MtmlMemory *mem, unsigned long long *total);
+MtmlReturn mtmlMemoryGetTotal(const MtmlMemory *mem, unsigned long long *total);
 // Retrieves the amount of used memory on the device, in bytes.
-MtmlReturn MTML_API mtmlMemoryGetUsed(const MtmlMemory *mem, unsigned long long *used);
+MtmlReturn mtmlMemoryGetUsed(const MtmlMemory *mem, unsigned long long *used);
 // Retrieves the current memory utilization rate for the device.
-MtmlReturn MTML_API mtmlMemoryGetUtilization(const MtmlMemory *mem, unsigned int *utilization);
+MtmlReturn mtmlMemoryGetUtilization(const MtmlMemory *mem, unsigned int *utilization);

src/detection/host/host.h

@@ -13,4 +13,8 @@ typedef struct FFHostResult
     FFstrbuf vendor;
 } FFHostResult;
 
+const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel);
+#ifdef __x86_64__
+bool ffHostDetectMac(FFHostResult* host);
+#endif
 const char* ffDetectHost(FFHostResult* host);

src/detection/host/host_apple.c

@@ -5,179 +5,6 @@
 
 #include <IOKit/IOKitLib.h>
 
-static const char* getProductNameWithHwModel(const FFstrbuf* hwModel)
-{
-    // Macbook Pro: https://support.apple.com/en-us/HT201300
-    // Macbook Air: https://support.apple.com/en-us/HT201862
-    // Mac mini:    https://support.apple.com/en-us/HT201894
-    // iMac:        https://support.apple.com/en-us/HT201634
-    // Mac Pro:     https://support.apple.com/en-us/HT202888
-    // Mac Studio:  https://support.apple.com/en-us/HT213073
-
-    if(ffStrbufStartsWithS(hwModel, "MacBookPro"))
-    {
-        const char* version = hwModel->chars + strlen("MacBookPro");
-        if(ffStrEquals(version, "18,3") ||
-           ffStrEquals(version, "18,4"))        return "MacBook Pro (14-inch, 2021)";
-        if(ffStrEquals(version, "18,1") ||
-           ffStrEquals(version, "18,2"))        return "MacBook Pro (16-inch, 2021)";
-        if(ffStrEquals(version, "17,1"))        return "MacBook Pro (13-inch, M1, 2020)";
-        if(ffStrEquals(version, "16,3"))        return "MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "16,2"))        return "MacBook Pro (13-inch, 2020, Four Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "16,4") ||
-           ffStrEquals(version, "16,1"))        return "MacBook Pro (16-inch, 2019)";
-        if(ffStrEquals(version, "15,4"))        return "MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "15,3"))        return "MacBook Pro (15-inch, 2019)";
-        if(ffStrEquals(version, "15,2"))        return "MacBook Pro (13-inch, 2018/2019, Four Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "15,1"))        return "MacBook Pro (15-inch, 2018/2019)";
-        if(ffStrEquals(version, "14,3"))        return "MacBook Pro (15-inch, 2017)";
-        if(ffStrEquals(version, "14,2"))        return "MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "14,1"))        return "MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "13,3"))        return "MacBook Pro (15-inch, 2016)";
-        if(ffStrEquals(version, "13,2"))        return "MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "13,1"))        return "MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)";
-        if(ffStrEquals(version, "12,1"))        return "MacBook Pro (Retina, 13-inch, Early 2015)";
-        if(ffStrEquals(version, "11,4") ||
-           ffStrEquals(version, "11,5"))        return "MacBook Pro (Retina, 15-inch, Mid 2015)";
-        if(ffStrEquals(version, "11,2") ||
-           ffStrEquals(version, "11,3"))        return "MacBook Pro (Retina, 15-inch, Late 2013/Mid 2014)";
-        if(ffStrEquals(version, "11,1"))        return "MacBook Pro (Retina, 13-inch, Late 2013/Mid 2014)";
-        if(ffStrEquals(version, "10,2"))        return "MacBook Pro (Retina, 13-inch, Late 2012/Early 2013)";
-        if(ffStrEquals(version, "10,1"))        return "MacBook Pro (Retina, 15-inch, Mid 2012/Early 2013)";
-        if(ffStrEquals(version, "9,2"))         return "MacBook Pro (13-inch, Mid 2012)";
-        if(ffStrEquals(version, "9,1"))         return "MacBook Pro (15-inch, Mid 2012)";
-        if(ffStrEquals(version, "8,3"))         return "MacBook Pro (17-inch, 2011)";
-        if(ffStrEquals(version, "8,2"))         return "MacBook Pro (15-inch, 2011)";
-        if(ffStrEquals(version, "8,1"))         return "MacBook Pro (13-inch, 2011)";
-        if(ffStrEquals(version, "7,1"))         return "MacBook Pro (13-inch, Mid 2010)";
-        if(ffStrEquals(version, "6,2"))         return "MacBook Pro (15-inch, Mid 2010)";
-        if(ffStrEquals(version, "6,1"))         return "MacBook Pro (17-inch, Mid 2010)";
-        if(ffStrEquals(version, "5,5"))         return "MacBook Pro (13-inch, Mid 2009)";
-        if(ffStrEquals(version, "5,3"))         return "MacBook Pro (15-inch, Mid 2009)";
-        if(ffStrEquals(version, "5,2"))         return "MacBook Pro (17-inch, Mid/Early 2009)";
-        if(ffStrEquals(version, "5,1"))         return "MacBook Pro (15-inch, Late 2008)";
-        if(ffStrEquals(version, "4,1"))         return "MacBook Pro (17/15-inch, Early 2008)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "MacBookAir"))
-    {
-        const char* version = hwModel->chars + strlen("MacBookAir");
-        if(ffStrEquals(version, "10,1"))        return "MacBook Air (M1, 2020)";
-        if(ffStrEquals(version, "9,1"))         return "MacBook Air (Retina, 13-inch, 2020)";
-        if(ffStrEquals(version, "8,2"))         return "MacBook Air (Retina, 13-inch, 2019)";
-        if(ffStrEquals(version, "8,1"))         return "MacBook Air (Retina, 13-inch, 2018)";
-        if(ffStrEquals(version, "7,2"))         return "MacBook Air (13-inch, Early 2015/2017)";
-        if(ffStrEquals(version, "7,1"))         return "MacBook Air (11-inch, Early 2015)";
-        if(ffStrEquals(version, "6,2"))         return "MacBook Air (13-inch, Mid 2013/Early 2014)";
-        if(ffStrEquals(version, "6,1"))         return "MacBook Air (11-inch, Mid 2013/Early 2014)";
-        if(ffStrEquals(version, "5,2"))         return "MacBook Air (13-inch, Mid 2012)";
-        if(ffStrEquals(version, "5,1"))         return "MacBook Air (11-inch, Mid 2012)";
-        if(ffStrEquals(version, "4,2"))         return "MacBook Air (13-inch, Mid 2011)";
-        if(ffStrEquals(version, "4,1"))         return "MacBook Air (11-inch, Mid 2011)";
-        if(ffStrEquals(version, "3,2"))         return "MacBook Air (13-inch, Late 2010)";
-        if(ffStrEquals(version, "3,1"))         return "MacBook Air (11-inch, Late 2010)";
-        if(ffStrEquals(version, "2,1"))         return "MacBook Air (Mid 2009)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "Macmini"))
-    {
-        const char* version = hwModel->chars + strlen("Macmini");
-        if(ffStrEquals(version, "9,1"))         return "Mac mini (M1, 2020)";
-        if(ffStrEquals(version, "8,1"))         return "Mac mini (2018)";
-        if(ffStrEquals(version, "7,1"))         return "Mac mini (Mid 2014)";
-        if(ffStrEquals(version, "6,1") ||
-           ffStrEquals(version, "6,2"))         return "Mac mini (Late 2012)";
-        if(ffStrEquals(version, "5,1") ||
-           ffStrEquals(version, "5,2"))         return "Mac mini (Mid 2011)";
-        if(ffStrEquals(version, "4,1"))         return "Mac mini (Mid 2010)";
-        if(ffStrEquals(version, "3,1"))         return "Mac mini (Early/Late 2009)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "MacBook"))
-    {
-        const char* version = hwModel->chars + strlen("MacBook");
-        if(ffStrEquals(version, "10,1"))        return "MacBook (Retina, 12-inch, 2017)";
-        if(ffStrEquals(version, "9,1"))         return "MacBook (Retina, 12-inch, Early 2016)";
-        if(ffStrEquals(version, "8,1"))         return "MacBook (Retina, 12-inch, Early 2015)";
-        if(ffStrEquals(version, "7,1"))         return "MacBook (13-inch, Mid 2010)";
-        if(ffStrEquals(version, "6,1"))         return "MacBook (13-inch, Late 2009)";
-        if(ffStrEquals(version, "5,2"))         return "MacBook (13-inch, Early/Mid 2009)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "MacPro"))
-    {
-        const char* version = hwModel->chars + strlen("MacPro");
-        if(ffStrEquals(version, "7,1"))         return "Mac Pro (2019)";
-        if(ffStrEquals(version, "6,1"))         return "Mac Pro (Late 2013)";
-        if(ffStrEquals(version, "5,1"))         return "Mac Pro (Mid 2010 - Mid 2012)";
-        if(ffStrEquals(version, "4,1"))         return "Mac Pro (Early 2009)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "Mac"))
-    {
-        const char* version = hwModel->chars + strlen("Mac");
-        if(ffStrEquals(version, "16,3"))        return "iMac (24-inch, 2024, Four Thunderbolt / USB 4 ports)";
-        if(ffStrEquals(version, "16,2"))        return "iMac (24-inch, 2024, Two Thunderbolt / USB 4 ports)";
-        if(ffStrEquals(version, "16,1") ||
-           ffStrEquals(version, "16,6") ||
-           ffStrEquals(version, "16,8"))        return "MacBook Pro (14-inch, 2024, Three Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "16,7") || 
-           ffStrEquals(version, "16,5"))        return "MacBook Pro (16-inch, 2024, Three Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "16,15") || 
-           ffStrEquals(version, "16,10"))       return "Mac mini (2024)";
-        if(ffStrEquals(version, "15,13"))       return "MacBook Air (15-inch, M3, 2024)";
-        if(ffStrEquals(version, "15,2"))        return "MacBook Air (13-inch, M3, 2024)";
-        if(ffStrEquals(version, "15,3"))        return "MacBook Pro (14-inch, Nov 2023, Two Thunderbolt / USB 4 ports)";
-        if(ffStrEquals(version, "15,4"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports)";
-        if(ffStrEquals(version, "15,5"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports, Two USB 3 ports)";
-        if(ffStrEquals(version, "15,6") ||
-           ffStrEquals(version, "15,8") ||
-           ffStrEquals(version, "15,10"))       return "MacBook Pro (14-inch, Nov 2023, Three Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "15,7") ||
-           ffStrEquals(version, "15,9") ||
-           ffStrEquals(version, "15,11"))       return "MacBook Pro (16-inch, Nov 2023, Three Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "14,15"))       return "MacBook Air (15-inch, M2, 2023)";
-        if(ffStrEquals(version, "14,14"))       return "Mac Studio (M2 Ultra, 2023, Two Thunderbolt 4 front ports)";
-        if(ffStrEquals(version, "14,13"))       return "Mac Studio (M2 Max, 2023, Two USB-C front ports)";
-        if(ffStrEquals(version, "14,8"))        return "Mac Pro (2023)";
-        if(ffStrEquals(version, "14,6") ||
-           ffStrEquals(version, "14,10"))       return "MacBook Pro (16-inch, 2023)";
-        if(ffStrEquals(version, "14,5") ||
-           ffStrEquals(version, "14,9"))        return "MacBook Pro (14-inch, 2023)";
-        if(ffStrEquals(version, "14,3"))        return "Mac mini (M2, 2023, Two Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "14,12"))       return "Mac mini (M2, 2023, Four Thunderbolt 4 ports)";
-        if(ffStrEquals(version, "14,7"))        return "MacBook Pro (13-inch, M2, 2022)";
-        if(ffStrEquals(version, "14,2"))        return "MacBook Air (M2, 2022)";
-        if(ffStrEquals(version, "13,1"))        return "Mac Studio (M1 Max, 2022, Two USB-C front ports)";
-        if(ffStrEquals(version, "13,2"))        return "Mac Studio (M1 Ultra, 2022, Two Thunderbolt 4 front ports)";
-    }
-    else if(ffStrbufStartsWithS(hwModel, "iMac"))
-    {
-        const char* version = hwModel->chars + strlen("iMac");
-        if(ffStrEquals(version, "21,1"))        return "iMac (24-inch, M1, 2021, Two Thunderbolt / USB 4 ports, Two USB 3 ports)";
-        if(ffStrEquals(version, "21,2"))        return "iMac (24-inch, M1, 2021, Two Thunderbolt / USB 4 ports)";
-        if(ffStrEquals(version, "20,1") ||
-           ffStrEquals(version, "20,2"))        return "iMac (Retina 5K, 27-inch, 2020)";
-        if(ffStrEquals(version, "19,1"))        return "iMac (Retina 5K, 27-inch, 2019)";
-        if(ffStrEquals(version, "19,2"))        return "iMac (Retina 4K, 21.5-inch, 2019)";
-        if(ffStrEquals(version, "Pro1,1"))      return "iMac Pro (2017)";
-        if(ffStrEquals(version, "18,3"))        return "iMac (Retina 5K, 27-inch, 2017)";
-        if(ffStrEquals(version, "18,2"))        return "iMac (Retina 4K, 21.5-inch, 2017)";
-        if(ffStrEquals(version, "18,1"))        return "iMac (21.5-inch, 2017)";
-        if(ffStrEquals(version, "17,1"))        return "iMac (Retina 5K, 27-inch, Late 2015)";
-        if(ffStrEquals(version, "16,2"))        return "iMac (Retina 4K, 21.5-inch, Late 2015)";
-        if(ffStrEquals(version, "16,1"))        return "iMac (21.5-inch, Late 2015)";
-        if(ffStrEquals(version, "15,1"))        return "iMac (Retina 5K, 27-inch, Late 2014 - Mid 2015)";
-        if(ffStrEquals(version, "14,4"))        return "iMac (21.5-inch, Mid 2014)";
-        if(ffStrEquals(version, "14,2"))        return "iMac (27-inch, Late 2013)";
-        if(ffStrEquals(version, "14,1"))        return "iMac (21.5-inch, Late 2013)";
-        if(ffStrEquals(version, "13,2"))        return "iMac (27-inch, Late 2012)";
-        if(ffStrEquals(version, "13,1"))        return "iMac (21.5-inch, Late 2012)";
-        if(ffStrEquals(version, "12,2"))        return "iMac (27-inch, Mid 2011)";
-        if(ffStrEquals(version, "12,1"))        return "iMac (21.5-inch, Mid 2011)";
-        if(ffStrEquals(version, "11,3"))        return "iMac (27-inch, Mid 2010)";
-        if(ffStrEquals(version, "11,2"))        return "iMac (21.5-inch, Mid 2010)";
-        if(ffStrEquals(version, "10,1"))        return "iMac (27/21.5-inch, Late 2009)";
-        if(ffStrEquals(version, "9,1"))         return "iMac (24/20-inch, Early 2009)";
-    }
-    return NULL;
-}
-
 const char* getProductNameWithIokit(FFstrbuf* result)
 {
     FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t registryEntry = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceNameMatching("product"));
@@ -217,7 +44,7 @@ const char* ffDetectHost(FFHostResult* host)
     const char* error = ffSysctlGetString("hw.model", &host->family);
     if (error) return error;
 
-    ffStrbufSetStatic(&host->name, getProductNameWithHwModel(&host->family));
+    ffStrbufSetStatic(&host->name, ffHostGetMacProductNameWithHwModel(&host->family));
     if (host->name.length == 0)
         getProductNameWithIokit(&host->name);
     if (host->name.length == 0)

src/detection/host/host_bsd.c

@@ -19,5 +19,9 @@ const char* ffDetectHost(FFHostResult* host)
     ffSettingsGetFreeBSDKenv("smbios.system.maker", &host->vendor);
     ffCleanUpSmbiosValue(&host->vendor);
 
+    #ifdef __x86_64__
+    ffHostDetectMac(host);
+    #endif
+
     return NULL;
 }

src/detection/host/host_linux.c

@@ -63,6 +63,10 @@ const char* ffDetectHost(FFHostResult* host)
             ffStrbufSetStatic(&host->vendor, "Apple Inc.");
     }
 
+    #ifdef __x86_64__
+    ffHostDetectMac(host);
+    #endif
+
     //KVM/Qemu virtual machine
     if(ffStrbufStartsWithS(&host->name, "Standard PC"))
         ffStrbufPrependS(&host->name, "KVM/QEMU ");

src/detection/host/host_mac.c

@@ -0,0 +1,193 @@
+#include "host.h"
+#include "util/stringUtils.h"
+
+const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel)
+{
+    // Macbook Pro: https://support.apple.com/en-us/HT201300
+    // Macbook Air: https://support.apple.com/en-us/HT201862
+    // Mac mini:    https://support.apple.com/en-us/HT201894
+    // iMac:        https://support.apple.com/en-us/HT201634
+    // Mac Pro:     https://support.apple.com/en-us/HT202888
+    // Mac Studio:  https://support.apple.com/en-us/HT213073
+
+    if(ffStrbufStartsWithS(hwModel, "MacBookPro"))
+    {
+        const char* version = hwModel->chars + strlen("MacBookPro");
+        if(ffStrEquals(version, "18,3") ||
+           ffStrEquals(version, "18,4"))        return "MacBook Pro (14-inch, 2021)";
+        if(ffStrEquals(version, "18,1") ||
+           ffStrEquals(version, "18,2"))        return "MacBook Pro (16-inch, 2021)";
+        if(ffStrEquals(version, "17,1"))        return "MacBook Pro (13-inch, M1, 2020)";
+        if(ffStrEquals(version, "16,3"))        return "MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "16,2"))        return "MacBook Pro (13-inch, 2020, Four Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "16,4") ||
+           ffStrEquals(version, "16,1"))        return "MacBook Pro (16-inch, 2019)";
+        if(ffStrEquals(version, "15,4"))        return "MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "15,3"))        return "MacBook Pro (15-inch, 2019)";
+        if(ffStrEquals(version, "15,2"))        return "MacBook Pro (13-inch, 2018/2019, Four Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "15,1"))        return "MacBook Pro (15-inch, 2018/2019)";
+        if(ffStrEquals(version, "14,3"))        return "MacBook Pro (15-inch, 2017)";
+        if(ffStrEquals(version, "14,2"))        return "MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "14,1"))        return "MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "13,3"))        return "MacBook Pro (15-inch, 2016)";
+        if(ffStrEquals(version, "13,2"))        return "MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "13,1"))        return "MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)";
+        if(ffStrEquals(version, "12,1"))        return "MacBook Pro (Retina, 13-inch, Early 2015)";
+        if(ffStrEquals(version, "11,4") ||
+           ffStrEquals(version, "11,5"))        return "MacBook Pro (Retina, 15-inch, Mid 2015)";
+        if(ffStrEquals(version, "11,2") ||
+           ffStrEquals(version, "11,3"))        return "MacBook Pro (Retina, 15-inch, Late 2013/Mid 2014)";
+        if(ffStrEquals(version, "11,1"))        return "MacBook Pro (Retina, 13-inch, Late 2013/Mid 2014)";
+        if(ffStrEquals(version, "10,2"))        return "MacBook Pro (Retina, 13-inch, Late 2012/Early 2013)";
+        if(ffStrEquals(version, "10,1"))        return "MacBook Pro (Retina, 15-inch, Mid 2012/Early 2013)";
+        if(ffStrEquals(version, "9,2"))         return "MacBook Pro (13-inch, Mid 2012)";
+        if(ffStrEquals(version, "9,1"))         return "MacBook Pro (15-inch, Mid 2012)";
+        if(ffStrEquals(version, "8,3"))         return "MacBook Pro (17-inch, 2011)";
+        if(ffStrEquals(version, "8,2"))         return "MacBook Pro (15-inch, 2011)";
+        if(ffStrEquals(version, "8,1"))         return "MacBook Pro (13-inch, 2011)";
+        if(ffStrEquals(version, "7,1"))         return "MacBook Pro (13-inch, Mid 2010)";
+        if(ffStrEquals(version, "6,2"))         return "MacBook Pro (15-inch, Mid 2010)";
+        if(ffStrEquals(version, "6,1"))         return "MacBook Pro (17-inch, Mid 2010)";
+        if(ffStrEquals(version, "5,5"))         return "MacBook Pro (13-inch, Mid 2009)";
+        if(ffStrEquals(version, "5,3"))         return "MacBook Pro (15-inch, Mid 2009)";
+        if(ffStrEquals(version, "5,2"))         return "MacBook Pro (17-inch, Mid/Early 2009)";
+        if(ffStrEquals(version, "5,1"))         return "MacBook Pro (15-inch, Late 2008)";
+        if(ffStrEquals(version, "4,1"))         return "MacBook Pro (17/15-inch, Early 2008)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "MacBookAir"))
+    {
+        const char* version = hwModel->chars + strlen("MacBookAir");
+        if(ffStrEquals(version, "10,1"))        return "MacBook Air (M1, 2020)";
+        if(ffStrEquals(version, "9,1"))         return "MacBook Air (Retina, 13-inch, 2020)";
+        if(ffStrEquals(version, "8,2"))         return "MacBook Air (Retina, 13-inch, 2019)";
+        if(ffStrEquals(version, "8,1"))         return "MacBook Air (Retina, 13-inch, 2018)";
+        if(ffStrEquals(version, "7,2"))         return "MacBook Air (13-inch, Early 2015/2017)";
+        if(ffStrEquals(version, "7,1"))         return "MacBook Air (11-inch, Early 2015)";
+        if(ffStrEquals(version, "6,2"))         return "MacBook Air (13-inch, Mid 2013/Early 2014)";
+        if(ffStrEquals(version, "6,1"))         return "MacBook Air (11-inch, Mid 2013/Early 2014)";
+        if(ffStrEquals(version, "5,2"))         return "MacBook Air (13-inch, Mid 2012)";
+        if(ffStrEquals(version, "5,1"))         return "MacBook Air (11-inch, Mid 2012)";
+        if(ffStrEquals(version, "4,2"))         return "MacBook Air (13-inch, Mid 2011)";
+        if(ffStrEquals(version, "4,1"))         return "MacBook Air (11-inch, Mid 2011)";
+        if(ffStrEquals(version, "3,2"))         return "MacBook Air (13-inch, Late 2010)";
+        if(ffStrEquals(version, "3,1"))         return "MacBook Air (11-inch, Late 2010)";
+        if(ffStrEquals(version, "2,1"))         return "MacBook Air (Mid 2009)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "Macmini"))
+    {
+        const char* version = hwModel->chars + strlen("Macmini");
+        if(ffStrEquals(version, "9,1"))         return "Mac mini (M1, 2020)";
+        if(ffStrEquals(version, "8,1"))         return "Mac mini (2018)";
+        if(ffStrEquals(version, "7,1"))         return "Mac mini (Mid 2014)";
+        if(ffStrEquals(version, "6,1") ||
+           ffStrEquals(version, "6,2"))         return "Mac mini (Late 2012)";
+        if(ffStrEquals(version, "5,1") ||
+           ffStrEquals(version, "5,2"))         return "Mac mini (Mid 2011)";
+        if(ffStrEquals(version, "4,1"))         return "Mac mini (Mid 2010)";
+        if(ffStrEquals(version, "3,1"))         return "Mac mini (Early/Late 2009)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "MacBook"))
+    {
+        const char* version = hwModel->chars + strlen("MacBook");
+        if(ffStrEquals(version, "10,1"))        return "MacBook (Retina, 12-inch, 2017)";
+        if(ffStrEquals(version, "9,1"))         return "MacBook (Retina, 12-inch, Early 2016)";
+        if(ffStrEquals(version, "8,1"))         return "MacBook (Retina, 12-inch, Early 2015)";
+        if(ffStrEquals(version, "7,1"))         return "MacBook (13-inch, Mid 2010)";
+        if(ffStrEquals(version, "6,1"))         return "MacBook (13-inch, Late 2009)";
+        if(ffStrEquals(version, "5,2"))         return "MacBook (13-inch, Early/Mid 2009)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "MacPro"))
+    {
+        const char* version = hwModel->chars + strlen("MacPro");
+        if(ffStrEquals(version, "7,1"))         return "Mac Pro (2019)";
+        if(ffStrEquals(version, "6,1"))         return "Mac Pro (Late 2013)";
+        if(ffStrEquals(version, "5,1"))         return "Mac Pro (Mid 2010 - Mid 2012)";
+        if(ffStrEquals(version, "4,1"))         return "Mac Pro (Early 2009)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "Mac"))
+    {
+        const char* version = hwModel->chars + strlen("Mac");
+        if(ffStrEquals(version, "16,3"))        return "iMac (24-inch, 2024, Four Thunderbolt / USB 4 ports)";
+        if(ffStrEquals(version, "16,2"))        return "iMac (24-inch, 2024, Two Thunderbolt / USB 4 ports)";
+        if(ffStrEquals(version, "16,1") ||
+           ffStrEquals(version, "16,6") ||
+           ffStrEquals(version, "16,8"))        return "MacBook Pro (14-inch, 2024, Three Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "16,7") ||
+           ffStrEquals(version, "16,5"))        return "MacBook Pro (16-inch, 2024, Three Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "16,15") ||
+           ffStrEquals(version, "16,10"))       return "Mac mini (2024)";
+        if(ffStrEquals(version, "15,13"))       return "MacBook Air (15-inch, M3, 2024)";
+        if(ffStrEquals(version, "15,2"))        return "MacBook Air (13-inch, M3, 2024)";
+        if(ffStrEquals(version, "15,3"))        return "MacBook Pro (14-inch, Nov 2023, Two Thunderbolt / USB 4 ports)";
+        if(ffStrEquals(version, "15,4"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports)";
+        if(ffStrEquals(version, "15,5"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports, Two USB 3 ports)";
+        if(ffStrEquals(version, "15,6") ||
+           ffStrEquals(version, "15,8") ||
+           ffStrEquals(version, "15,10"))       return "MacBook Pro (14-inch, Nov 2023, Three Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "15,7") ||
+           ffStrEquals(version, "15,9") ||
+           ffStrEquals(version, "15,11"))       return "MacBook Pro (16-inch, Nov 2023, Three Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "14,15"))       return "MacBook Air (15-inch, M2, 2023)";
+        if(ffStrEquals(version, "14,14"))       return "Mac Studio (M2 Ultra, 2023, Two Thunderbolt 4 front ports)";
+        if(ffStrEquals(version, "14,13"))       return "Mac Studio (M2 Max, 2023, Two USB-C front ports)";
+        if(ffStrEquals(version, "14,8"))        return "Mac Pro (2023)";
+        if(ffStrEquals(version, "14,6") ||
+           ffStrEquals(version, "14,10"))       return "MacBook Pro (16-inch, 2023)";
+        if(ffStrEquals(version, "14,5") ||
+           ffStrEquals(version, "14,9"))        return "MacBook Pro (14-inch, 2023)";
+        if(ffStrEquals(version, "14,3"))        return "Mac mini (M2, 2023, Two Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "14,12"))       return "Mac mini (M2, 2023, Four Thunderbolt 4 ports)";
+        if(ffStrEquals(version, "14,7"))        return "MacBook Pro (13-inch, M2, 2022)";
+        if(ffStrEquals(version, "14,2"))        return "MacBook Air (M2, 2022)";
+        if(ffStrEquals(version, "13,1"))        return "Mac Studio (M1 Max, 2022, Two USB-C front ports)";
+        if(ffStrEquals(version, "13,2"))        return "Mac Studio (M1 Ultra, 2022, Two Thunderbolt 4 front ports)";
+    }
+    else if(ffStrbufStartsWithS(hwModel, "iMac"))
+    {
+        const char* version = hwModel->chars + strlen("iMac");
+        if(ffStrEquals(version, "21,1"))        return "iMac (24-inch, M1, 2021, Two Thunderbolt / USB 4 ports, Two USB 3 ports)";
+        if(ffStrEquals(version, "21,2"))        return "iMac (24-inch, M1, 2021, Two Thunderbolt / USB 4 ports)";
+        if(ffStrEquals(version, "20,1") ||
+           ffStrEquals(version, "20,2"))        return "iMac (Retina 5K, 27-inch, 2020)";
+        if(ffStrEquals(version, "19,1"))        return "iMac (Retina 5K, 27-inch, 2019)";
+        if(ffStrEquals(version, "19,2"))        return "iMac (Retina 4K, 21.5-inch, 2019)";
+        if(ffStrEquals(version, "Pro1,1"))      return "iMac Pro (2017)";
+        if(ffStrEquals(version, "18,3"))        return "iMac (Retina 5K, 27-inch, 2017)";
+        if(ffStrEquals(version, "18,2"))        return "iMac (Retina 4K, 21.5-inch, 2017)";
+        if(ffStrEquals(version, "18,1"))        return "iMac (21.5-inch, 2017)";
+        if(ffStrEquals(version, "17,1"))        return "iMac (Retina 5K, 27-inch, Late 2015)";
+        if(ffStrEquals(version, "16,2"))        return "iMac (Retina 4K, 21.5-inch, Late 2015)";
+        if(ffStrEquals(version, "16,1"))        return "iMac (21.5-inch, Late 2015)";
+        if(ffStrEquals(version, "15,1"))        return "iMac (Retina 5K, 27-inch, Late 2014 - Mid 2015)";
+        if(ffStrEquals(version, "14,4"))        return "iMac (21.5-inch, Mid 2014)";
+        if(ffStrEquals(version, "14,2"))        return "iMac (27-inch, Late 2013)";
+        if(ffStrEquals(version, "14,1"))        return "iMac (21.5-inch, Late 2013)";
+        if(ffStrEquals(version, "13,2"))        return "iMac (27-inch, Late 2012)";
+        if(ffStrEquals(version, "13,1"))        return "iMac (21.5-inch, Late 2012)";
+        if(ffStrEquals(version, "12,2"))        return "iMac (27-inch, Mid 2011)";
+        if(ffStrEquals(version, "12,1"))        return "iMac (21.5-inch, Mid 2011)";
+        if(ffStrEquals(version, "11,3"))        return "iMac (27-inch, Mid 2010)";
+        if(ffStrEquals(version, "11,2"))        return "iMac (21.5-inch, Mid 2010)";
+        if(ffStrEquals(version, "10,1"))        return "iMac (27/21.5-inch, Late 2009)";
+        if(ffStrEquals(version, "9,1"))         return "iMac (24/20-inch, Early 2009)";
+    }
+    return NULL;
+}
+
+#ifdef __x86_64__
+bool ffHostDetectMac(FFHostResult* host)
+{
+    if (ffStrbufEqualS(&host->family, "Mac") && ffStrbufEqualS(&host->vendor, "Apple Inc."))
+    {
+        const char* productName = ffHostGetMacProductNameWithHwModel(&host->name);
+        if (productName)
+        {
+            ffStrbufDestroy(&host->family);
+            ffStrbufInitMove(&host->family, &host->name);
+            ffStrbufSetStatic(&host->name, productName);
+            return true;
+        }
+    }
+    return false;
+}
+#endif

src/detection/host/host_windows.c

@@ -72,5 +72,9 @@ const char* ffDetectHost(FFHostResult* host)
         ffCleanUpSmbiosValue(&host->family);
     }
 
+    #if _WIN32 && __x86_64__
+    ffHostDetectMac(host);
+    #endif
+
     return NULL;
 }

src/detection/media/media_linux.c

@@ -17,35 +17,22 @@
         continue; \
     }
 
-static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResult* result)
+static bool parseMprisMetadata(FFDBusData* data, DBusMessageIter* rootIterator, FFMediaResult* result)
 {
-    DBusMessage* reply = ffDBusGetProperty(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "Metadata");
-    if(reply == NULL)
-        return false;
-
-    DBusMessageIter rootIterator;
-    if(!data->lib->ffdbus_message_iter_init(reply, &rootIterator))
-    {
-        data->lib->ffdbus_message_unref(reply);
-        return false;
-    }
-
-    if(data->lib->ffdbus_message_iter_get_arg_type(&rootIterator) != DBUS_TYPE_VARIANT)
-    {
-        data->lib->ffdbus_message_unref(reply);
-        return false;
-    }
-
-    DBusMessageIter variantIterator;
-    data->lib->ffdbus_message_iter_recurse(&rootIterator, &variantIterator);
-    if(data->lib->ffdbus_message_iter_get_arg_type(&variantIterator) != DBUS_TYPE_ARRAY)
-    {
-        data->lib->ffdbus_message_unref(reply);
-        return false;
-    }
-
     DBusMessageIter arrayIterator;
-    data->lib->ffdbus_message_iter_recurse(&variantIterator, &arrayIterator);
+
+    if (data->lib->ffdbus_message_iter_get_arg_type(rootIterator) == DBUS_TYPE_VARIANT)
+    {
+        DBusMessageIter variantIterator;
+        data->lib->ffdbus_message_iter_recurse(rootIterator, &variantIterator);
+        if(data->lib->ffdbus_message_iter_get_arg_type(&variantIterator) != DBUS_TYPE_ARRAY)
+            return false;
+        data->lib->ffdbus_message_iter_recurse(&variantIterator, &arrayIterator);
+    }
+    else
+    {
+        data->lib->ffdbus_message_iter_recurse(rootIterator, &arrayIterator);
+    }
 
     while(true)
     {
@@ -66,13 +53,17 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
 
         data->lib->ffdbus_message_iter_next(&dictIterator);
 
-        if(ffStrEquals(key, "xesam:title"))
+        if(!ffStrStartsWith(key, "xesam:"))
+            FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
+
+        key += strlen("xesam:");
+        if(ffStrEquals(key, "title"))
             ffDBusGetString(data, &dictIterator, &result->song);
-        else if(ffStrEquals(key, "xesam:album"))
+        else if(ffStrEquals(key, "album"))
             ffDBusGetString(data, &dictIterator, &result->album);
-        else if(ffStrEquals(key, "xesam:artist"))
+        else if(ffStrEquals(key, "artist"))
             ffDBusGetString(data, &dictIterator, &result->artist);
-        else if(ffStrEquals(key, "xesam:url"))
+        else if(ffStrEquals(key, "url"))
             ffDBusGetString(data, &dictIterator, &result->url);
 
         if(result->song.length > 0 && result->artist.length > 0 && result->album.length > 0 && result->url.length > 0)
@@ -81,7 +72,53 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
         FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
     }
 
-    data->lib->ffdbus_message_unref(reply);
+    return true;
+}
+
+static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResult* result)
+{
+    // Get all properties at once to reduce the number of IPCs
+    DBusMessage* reply = ffDBusGetAllProperties(data, busName, "/org/mpris/MediaPlayer2", "");
+    if(reply == NULL)
+        return false;
+
+    DBusMessageIter rootIterator;
+    if(!data->lib->ffdbus_message_iter_init(reply, &rootIterator) &&
+        data->lib->ffdbus_message_iter_get_arg_type(&rootIterator) != DBUS_TYPE_ARRAY)
+    {
+        data->lib->ffdbus_message_unref(reply);
+        return false;
+    }
+
+    DBusMessageIter arrayIterator;
+    data->lib->ffdbus_message_iter_recurse(&rootIterator, &arrayIterator);
+
+    FF_STRBUF_AUTO_DESTROY desktopIdentity = ffStrbufCreate();
+
+    while(true)
+    {
+        if(data->lib->ffdbus_message_iter_get_arg_type(&arrayIterator) != DBUS_TYPE_DICT_ENTRY)
+            FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
+
+        DBusMessageIter dictIterator;
+        data->lib->ffdbus_message_iter_recurse(&arrayIterator, &dictIterator);
+
+        const char* key;
+        data->lib->ffdbus_message_iter_get_basic(&dictIterator, &key);
+
+        data->lib->ffdbus_message_iter_next(&dictIterator);
+
+        if(ffStrEquals(key, "Metadata"))
+            parseMprisMetadata(data, &dictIterator, result);
+        else if(ffStrEquals(key, "PlaybackStatus"))
+            ffDBusGetString(data, &dictIterator, &result->status);
+        else if(ffStrEquals(key, "Identity"))
+            ffDBusGetString(data, &dictIterator, &result->player);
+        else if(ffStrEquals(key, "DesktopEntry"))
+            ffDBusGetString(data, &dictIterator, &desktopIdentity);
+
+        FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
+    }
 
     if(result->song.length == 0)
     {
@@ -91,17 +128,20 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
         return false;
     }
 
-    ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "PlaybackStatus", &result->status);
+    if (result->player.length == 0)
+    {
+        if (desktopIdentity.length > 0)
+        {
+            ffStrbufDestroy(&result->player);
+            ffStrbufInitMove(&result->player, &desktopIdentity);
+        }
+        else
+        {
+            ffStrbufAppend(&result->player, &result->playerId);
+        }
+    }
 
-    //Set short bus name
+    data->lib->ffdbus_message_unref(reply);
-    ffStrbufAppendS(&result->playerId, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
-
-    //We found a song, get the player name
-    ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
-    if(result->player.length == 0)
-        ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
-    if(result->player.length == 0)
-        ffStrbufAppend(&result->player, &result->playerId);
 
     return true;
 }
@@ -122,9 +162,9 @@ static void getCustomBus(FFDBusData* data, const FFstrbuf* playerName, FFMediaRe
 static void getBestBus(FFDBusData* data, FFMediaResult* result)
 {
     if(
-        getBusProperties(data, FF_DBUS_MPRIS_PREFIX"spotify", result) ||
+        getBusProperties(data, FF_DBUS_MPRIS_PREFIX "spotify", result) ||
-        getBusProperties(data, FF_DBUS_MPRIS_PREFIX"vlc", result) ||
+        getBusProperties(data, FF_DBUS_MPRIS_PREFIX "vlc", result) ||
-        getBusProperties(data, FF_DBUS_MPRIS_PREFIX"plasma-browser-integration", result)
+        getBusProperties(data, FF_DBUS_MPRIS_PREFIX "plasma-browser-integration", result)
     ) return;
 
     DBusMessage* reply = ffDBusGetMethodReply(data, "org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames", NULL);

src/detection/opengl/opengl_linux.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "opengl.h"
+#include "common/io/io.h"
 
 #include <string.h>
 
@@ -140,6 +141,8 @@ static const char* detectByGlx(FFOpenGLResult* result)
     FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(glx, data, XCloseDisplay);
     FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(glx, data, XFree);
 
+    FF_SUPPRESS_IO();
+
     return glxHandleData(result, &data);
 }
 

src/detection/opengl/opengl_shared.c

@@ -27,7 +27,10 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG
 #if defined(FF_HAVE_EGL) || __has_include(<EGL/egl.h>)
 #include "common/io/io.h"
 
+#define EGL_EGL_PROTOTYPES 1
+#define EGL_EGLEXT_PROTOTYPES 1
 #include <EGL/egl.h>
+#include <EGL/eglext.h>
 
 typedef struct EGLData
 {
@@ -102,9 +105,20 @@ static const char* eglHandleData(FFOpenGLResult* result, EGLData* data)
     if(!data->ffglGetString)
         return "eglGetProcAddress(glGetString) returned NULL";
 
-    data->display = data->ffeglGetDisplay(EGL_DEFAULT_DISPLAY);
+    #if EGL_VERSION_1_5
-    if(data->display == EGL_NO_DISPLAY)
+    PFNEGLGETPLATFORMDISPLAYEXTPROC ffeglGetPlatformDisplay = (PFNEGLGETPLATFORMDISPLAYEXTPROC) data->ffeglGetProcAddress("eglGetPlatformDisplay");
-        return "eglGetDisplay returned EGL_NO_DISPLAY";
+    if (ffeglGetPlatformDisplay)
+        data->display = ffeglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA, NULL, NULL);
+
+    if(!ffeglGetPlatformDisplay || data->display == EGL_NO_DISPLAY)
+    #endif
+
+    {
+        data->display = data->ffeglGetDisplay(EGL_DEFAULT_DISPLAY);
+        if(data->display == EGL_NO_DISPLAY)
+            return "eglGetDisplay returned EGL_NO_DISPLAY";
+    }
+
 
     EGLint major, minor;
     if(data->ffeglInitialize(data->display, &major, &minor) == EGL_FALSE)

src/detection/os/os_linux.c

@@ -52,6 +52,15 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
     if(!ffStrSet(xdgConfigDirs))
         return;
 
+    if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
+    {
+        ffStrbufSetS(&result->name, "Linux Lite");
+        ffStrbufSetS(&result->id, "linuxlite");
+        ffStrbufSetS(&result->idLike, "ubuntu");
+        ffStrbufSetS(&result->versionID, result->prettyName.chars + strlen("Linux Lite "));
+        return;
+    }
+
     if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
     {
         ffStrbufSetS(&result->name, "Kubuntu");
@@ -166,6 +175,17 @@ FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
         ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
         return true;
     }
+    else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source
+    {
+        ffStrbufSetS(&result->name, "Armbian (custom build)");
+        ffStrbufSetS(&result->id, "armbian");
+        ffStrbufSetS(&result->idLike, "debian");
+        ffStrbufClear(&result->versionID);
+        uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
+        uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
+        ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
+        return true;
+    }
     else if (ffStrbufStartsWithS(&result->name, "Loc-OS"))
     {
         ffStrbufSetS(&result->id, "locos");
@@ -273,5 +293,13 @@ void ffDetectOSImpl(FFOSResult* os)
         if (!detectDebianDerived(os))
             getDebianVersion(os);
     }
+    else if(ffStrbufEqualS(&os->id, "linuxmint"))
+    {
+        if (ffStrbufEqualS(&os->name, "LMDE"))
+        {
+            ffStrbufSetS(&os->id, "lmde");
+            ffStrbufSetS(&os->idLike, "linuxmint");
+        }
+    }
     #endif
 }

src/detection/packages/packages_obsd.c

@@ -27,7 +27,7 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
     if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT))
     {
         result->pkg = getNumElementsImpl(FASTFETCH_TARGET_DIR_ROOT
-        #if __OpenBSD
+        #if __OpenBSD__
             "/var/db/pkg"
         #else
             "/usr/pkg/pkgdb"

src/detection/terminalfont/terminalfont_linux.c

@@ -250,7 +250,7 @@ static void detectFootTerminal(FFTerminalFontResult* terminalFont)
         ffFontInitValues(&terminalFont->font, font.chars, "8");
         return;
     }
-    uint32_t size = equal + strlen("size=");
+    uint32_t size = equal + (uint32_t) strlen("size=");
     uint32_t comma = ffStrbufNextIndexC(&font, size, ',');
     if (comma < font.length)
         font.chars[comma] = '\0';
@@ -454,4 +454,6 @@ void ffDetectTerminalFontPlatform(const FFTerminalResult* terminal, FFTerminalFo
         detectWestonTerminal(terminalFont);
     else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "terminator"))
         detectTerminator(terminalFont);
+    else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "sakura"))
+        detectFromConfigFile("sakura/sakura.conf", "font=", terminalFont);;
 }

src/detection/terminalshell/terminalshell.c

@@ -661,6 +661,19 @@ FF_MAYBE_UNUSED static bool getTerminalVersionTilix(FFstrbuf* exe, FFstrbuf* ver
     ffStrbufSubstrAfter(version, index);
     return true;
 }
+
+FF_MAYBE_UNUSED static bool getTerminalVersionSakura(FFstrbuf* exe, FFstrbuf* version)
+{
+    if(ffProcessAppendStdErr(version, (char* const[]) {
+        exe->chars,
+        "--version",
+        NULL
+    }) != NULL) // sakura version is 3.8.8
+        return false;
+
+    ffStrbufSubstrAfterLastC(version, ' ');
+    return true;
+}
 #endif
 
 #ifdef _WIN32
@@ -763,6 +776,9 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
     if(ffStrbufIgnCaseEqualS(processName, "tilix"))
         return getTerminalVersionTilix(exe, version);
 
+    if(ffStrbufIgnCaseEqualS(processName, "sakura"))
+        return getTerminalVersionSakura(exe, version);
+
     #endif
 
     #ifdef _WIN32

src/detection/wifi/wifi.h

@@ -18,6 +18,8 @@ struct FFWifiConnection
     double signalQuality; // Percentage
     double rxRate;
     double txRate;
+    uint16_t channel;
+    uint16_t frequency; // MHz
 };
 
 typedef struct FFWifiResult
@@ -27,3 +29,15 @@ typedef struct FFWifiResult
 } FFWifiResult;
 
 const char* ffDetectWifi(FFlist* result /*list of FFWifiItem*/);
+
+static inline uint16_t ffWifiFreqToChannel(uint16_t frequency)
+{
+    // https://github.com/opetryna/win32wifi/blob/master/win32wifi/Win32Wifi.py#L140
+    // FIXME: Does it work for 6 GHz?
+    if (frequency == 2484)
+        return 14;
+    else if (frequency < 2484)
+        return (uint16_t) ((frequency - 2407) / 5);
+    else
+        return (uint16_t) ((frequency / 5) - 1000);
+}

src/detection/wifi/wifi_android.c

@@ -43,6 +43,8 @@ const char* ffDetectWifi(FFlist* result)
     item->conn.signalQuality = 0.0/0.0;
     item->conn.rxRate = 0.0/0.0;
     item->conn.txRate = 0.0/0.0;
+    item->conn.channel = 0;
+    item->conn.frequency = 0;
 
     ffStrbufAppendS(&item->inf.status, yyjson_get_str(yyjson_obj_get(root, "supplicant_state")));
     if(!item->inf.status.length)
@@ -60,6 +62,9 @@ const char* ffDetectWifi(FFlist* result)
     ffStrbufAppendS(&item->inf.description, yyjson_get_str(yyjson_obj_get(root, "ip")));
     ffStrbufAppendS(&item->conn.bssid, yyjson_get_str(yyjson_obj_get(root, "bssid")));
     ffStrbufAppendS(&item->conn.ssid, yyjson_get_str(yyjson_obj_get(root, "ssid")));
+    item->conn.frequency = (uint16_t) yyjson_get_int(yyjson_obj_get(root, "frequency_mhz"));
+    item->conn.txRate = yyjson_get_num(yyjson_obj_get(root, "link_speed_mbps"));
+    item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
 
     return NULL;
 }

src/detection/wifi/wifi_apple.m

@@ -80,6 +80,8 @@ const char* ffDetectWifi(FFlist* result)
         item->conn.signalQuality = 0.0/0.0;
         item->conn.rxRate = 0.0/0.0;
         item->conn.txRate = 0.0/0.0;
+        item->conn.channel = 0;
+        item->conn.frequency = 0;
 
         ffStrbufAppendS(&item->inf.description, inf.interfaceName.UTF8String);
         ffStrbufSetStatic(&item->inf.status, inf.powerOn ? "Power On" : "Power Off");
@@ -289,6 +291,15 @@ const char* ffDetectWifi(FFlist* result)
                 ffStrbufAppendF(&item->conn.security, "Unknown (%ld)", inf.security);
                 break;
         }
+
+        item->conn.channel = (uint16_t) inf.wlanChannel.channelNumber;
+        switch (inf.wlanChannel.channelBand)
+        {
+            case kCWChannelBand2GHz: item->conn.frequency = 2400; break;
+            case kCWChannelBand5GHz: item->conn.frequency = 5400; break;
+            case 3 /*kCWChannelBand6GHz*/: item->conn.frequency = 6400; break;
+            default: item->conn.frequency = 0; break;
+        }
     }
     return NULL;
 }

src/detection/wifi/wifi_bsd.c

@@ -34,18 +34,32 @@ const char* ffDetectWifi(FFlist* result)
             item->conn.signalQuality = 0.0/0.0;
             item->conn.rxRate = 0.0/0.0;
             item->conn.txRate = 0.0/0.0;
+            item->conn.channel = 0;
+            item->conn.frequency = 0;
+
+            ffParsePropLines(ifconfig.chars, "status: ", &item->conn.status);
+            if (!ffStrbufEqualS(&item->conn.status, "associated"))
+                continue;
 
             ffParsePropLines(ifconfig.chars, "ssid ", &item->conn.ssid);
             if (item->conn.ssid.length)
             {
-                uint32_t ibssid = ffStrbufFirstIndexS(&item->conn.ssid, " bssid ");
+                // This doesn't work for quoted SSID values
-                if (ibssid < item->conn.ssid.length)
+                uint32_t idx = ffStrbufFirstIndexS(&item->conn.ssid, " bssid ");
+                if (idx < item->conn.ssid.length)
                 {
-                    ibssid += (uint32_t) strlen(" bssid ");
+                    ffStrbufSetS(&item->conn.bssid, item->conn.ssid.chars + idx + (uint32_t) strlen(" bssid "));
-                    ffStrbufSetS(&item->conn.bssid, item->conn.ssid.chars + ibssid);
+                    ffStrbufSubstrBefore(&item->conn.ssid, idx);
                 }
 
-                ffStrbufSubstrBeforeFirstC(&item->conn.ssid, ' ');
+                idx = ffStrbufFirstIndexS(&item->conn.ssid, " channel ");
+                if (idx < item->conn.ssid.length)
+                {
+                    const char* pchannel = item->conn.ssid.chars + idx + strlen(" channel ");
+                    sscanf(pchannel, "%hu (%hu MHz %*s)", &item->conn.channel, &item->conn.frequency);
+                }
+
+                ffStrbufSubstrBefore(&item->conn.ssid, idx);
             }
 
             ffParsePropLines(ifconfig.chars, "media: ", &item->conn.protocol);
@@ -60,8 +74,6 @@ const char* ffDetectWifi(FFlist* result)
                     ffStrbufPrependS(&item->conn.protocol, "802.");
                 }
             }
-
-            ffParsePropLines(ifconfig.chars, "status: ", &item->conn.status);
         }
     }
 

src/detection/wifi/wifi_linux.c

@@ -36,6 +36,13 @@ typedef enum {
     NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192 = 0x00002000,
 } NM80211ApSecurityFlags;
 
+#define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
+    { \
+        if(!(dbus).lib->ffdbus_message_iter_next(iterator)) \
+            break; \
+        continue; \
+    }
+
 static const char* detectWifiWithNm(FFWifiResult* item, FFstrbuf* buffer)
 {
     FFDBusData dbus;
@@ -72,24 +79,80 @@ static const char* detectWifiWithNm(FFWifiResult* item, FFstrbuf* buffer)
     if (!item->conn.status.length)
         ffStrbufSetStatic(&item->conn.status, "connected");
 
-    if (!item->conn.ssid.length)
+    DBusMessage* reply = ffDBusGetAllProperties(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint");
-        ffDBusGetPropertyString(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint", "Ssid", &item->conn.ssid);
+    if(reply == NULL)
+        return "Failed to get access point properties";
 
-    if (!item->conn.bssid.length)
+    DBusMessageIter rootIterator;
-        ffDBusGetPropertyString(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint", "HwAddress", &item->conn.bssid);
+    if(!dbus.lib->ffdbus_message_iter_init(reply, &rootIterator) &&
-
+        dbus.lib->ffdbus_message_iter_get_arg_type(&rootIterator) != DBUS_TYPE_ARRAY)
-    if (item->conn.signalQuality != item->conn.signalQuality)
     {
-        uint32_t strengthPercent;
+        dbus.lib->ffdbus_message_unref(reply);
-        if (ffDBusGetPropertyUint(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint", "Strength", &strengthPercent))
+        return "Invalid type of access point properties";
-            item->conn.signalQuality = strengthPercent;
     }
 
+    DBusMessageIter arrayIterator;
+    dbus.lib->ffdbus_message_iter_recurse(&rootIterator, &arrayIterator);
+
     NM80211ApFlags flags;
     NM80211ApSecurityFlags wpaFlags, rsnFlags;
-    if (ffDBusGetPropertyUint(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint", "Flags", &flags) &&
+    int flagCount = 0;
-        ffDBusGetPropertyUint(&dbus, "org.freedesktop.NetworkManager", apPath.chars, "org.freedesktop.NetworkManager.AccessPoint", "WpaFlags", &wpaFlags) &&
+
-        ffDBusGetPropertyUint(&dbus, "org.freedesktop.NetworkManager", apPath.chars , "org.freedesktop.NetworkManager.AccessPoint", "RsnFlags", &rsnFlags))
+    while(true)
+    {
+        if(dbus.lib->ffdbus_message_iter_get_arg_type(&arrayIterator) != DBUS_TYPE_DICT_ENTRY)
+            FF_DBUS_ITER_CONTINUE(dbus, &arrayIterator)
+
+        DBusMessageIter dictIterator;
+        dbus.lib->ffdbus_message_iter_recurse(&arrayIterator, &dictIterator);
+
+        const char* key;
+        dbus.lib->ffdbus_message_iter_get_basic(&dictIterator, &key);
+
+        dbus.lib->ffdbus_message_iter_next(&dictIterator);
+
+        if (ffStrEquals(key, "Ssid"))
+        {
+            if (!item->conn.ssid.length)
+                ffDBusGetString(&dbus, &dictIterator, &item->conn.ssid);
+        }
+        else if (ffStrEquals(key, "HwAddress"))
+        {
+            if (!item->conn.bssid.length)
+                ffDBusGetString(&dbus, &dictIterator, &item->conn.bssid);
+        }
+        else if (ffStrEquals(key, "Strength"))
+        {
+            if (item->conn.signalQuality != item->conn.signalQuality)
+            {
+                uint32_t strengthPercent;
+                if (ffDBusGetUint(&dbus, &dictIterator, &strengthPercent))
+                    item->conn.signalQuality = strengthPercent;
+            }
+        }
+        else if (ffStrEquals(key, "Frequency"))
+        {
+            if (item->conn.frequency == 0)
+            {
+                uint32_t frequency;
+                if (ffDBusGetUint(&dbus, &dictIterator, &frequency))
+                {
+                    item->conn.frequency = (uint16_t) frequency;
+                    if (item->conn.channel == 0)
+                        item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
+                }
+            }
+        }
+        else if ((ffStrEquals(key, "Flags") && ffDBusGetUint(&dbus, &dictIterator, &flags)) ||
+            (ffStrEquals(key, "WpaFlags") && ffDBusGetUint(&dbus, &dictIterator, &wpaFlags)) ||
+            (ffStrEquals(key, "RsnFlags") && ffDBusGetUint(&dbus, &dictIterator, &rsnFlags))
+        )
+            ++flagCount;
+
+        FF_DBUS_ITER_CONTINUE(dbus, &arrayIterator)
+    }
+
+    if (flagCount == 3)
     {
         if ((flags & NM_802_11_AP_FLAGS_PRIVACY) && (wpaFlags == NM_802_11_AP_SEC_NONE)
             && (rsnFlags == NM_802_11_AP_SEC_NONE))
@@ -166,7 +229,9 @@ static const char* detectWifiWithIw(FFWifiResult* item, FFstrbuf* buffer)
     {
         item->conn.txRate = ffStrbufToDouble(buffer);
 
-        if(ffStrbufContainS(buffer, " HE-MCS "))
+        if(ffStrbufContainS(buffer, " EHT-MCS "))
+            ffStrbufSetStatic(&item->conn.protocol, "802.11be (Wi-Fi 7)");
+        else if(ffStrbufContainS(buffer, " HE-MCS "))
             ffStrbufSetStatic(&item->conn.protocol, "802.11ax (Wi-Fi 6)");
         else if(ffStrbufContainS(buffer, " VHT-MCS "))
             ffStrbufSetStatic(&item->conn.protocol, "802.11ac (Wi-Fi 5)");
@@ -174,6 +239,13 @@ static const char* detectWifiWithIw(FFWifiResult* item, FFstrbuf* buffer)
             ffStrbufSetStatic(&item->conn.protocol, "802.11n (Wi-Fi 4)");
     }
 
+    ffStrbufClear(buffer);
+    if(ffParsePropLines(output.chars, "freq: ", buffer))
+    {
+        item->conn.frequency = (uint16_t) ffStrbufToUInt(buffer, 0);
+        item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
+    }
+
     return NULL;
 }
 
@@ -213,12 +285,36 @@ static const char* detectWifiWithIoctls(FFWifiResult* item)
     {
         for(int i = 0; i < 6; ++i)
             ffStrbufAppendF(&item->conn.bssid, "%.2X:", (uint8_t) iwr.u.ap_addr.sa_data[i]);
-        ffStrbufTrimRight(&item->conn.bssid, '-');
+        ffStrbufTrimRight(&item->conn.bssid, ':');
     }
 
     if(ioctl(sock, SIOCGIWRATE, &iwr) >= 0)
         item->conn.txRate = iwr.u.bitrate.value / 1000000.;
 
+    if(ioctl(sock, SIOCGIWFREQ, &iwr) >= 0)
+    {
+        if (iwr.u.freq.e == 0 && iwr.u.freq.m <= 1000)
+        {
+            item->conn.channel = (uint16_t) iwr.u.freq.m;
+        }
+        else
+        {
+            // convert it to MHz
+            while (iwr.u.freq.e < 6)
+            {
+                iwr.u.freq.m /= 10;
+                iwr.u.freq.e++;
+            }
+            while (iwr.u.freq.e > 6)
+            {
+                iwr.u.freq.m *= 10;
+                iwr.u.freq.e--;
+            }
+            item->conn.frequency = (uint16_t) iwr.u.freq.m;
+            item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
+        }
+    }
+
     struct iw_statistics stats;
     iwr.u.data.pointer = &stats;
     iwr.u.data.length = sizeof(stats);
@@ -289,6 +385,8 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED FFlist* result)
         item->conn.signalQuality = 0.0/0.0;
         item->conn.rxRate = 0.0/0.0;
         item->conn.txRate = 0.0/0.0;
+        item->conn.channel = 0;
+        item->conn.frequency = 0;
 
         ffStrbufSetF(&buffer, "/sys/class/net/%s/operstate", i->if_name);
         if (!ffAppendFileBuffer(buffer.chars, &item->inf.status))

src/detection/wifi/wifi_windows.c

@@ -49,6 +49,7 @@ const char* ffDetectWifi(FFlist* result)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanQueryInterface)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanFreeMemory)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanCloseHandle)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanGetNetworkBssList)
 
     DWORD curVersion;
     HANDLE hClient = NULL;
@@ -82,21 +83,23 @@ const char* ffDetectWifi(FFlist* result)
         item->conn.signalQuality = 0.0/0.0;
         item->conn.rxRate = 0.0/0.0;
         item->conn.txRate = 0.0/0.0;
+        item->conn.channel = 0;
+        item->conn.frequency = 0;
 
         convertIfStateToString(ifInfo->isState, &item->inf.status);
 
         if(ifInfo->isState != wlan_interface_state_connected)
             continue;
 
-        DWORD connectInfoSize = sizeof(WLAN_CONNECTION_ATTRIBUTES);
-        WLAN_OPCODE_VALUE_TYPE opCode = wlan_opcode_value_type_invalid;
         WLAN_CONNECTION_ATTRIBUTES* connInfo = NULL;
+        DWORD bufSize = sizeof(*connInfo);
+        WLAN_OPCODE_VALUE_TYPE opCode = wlan_opcode_value_type_query_only;
 
         if(ffWlanQueryInterface(hClient,
             &ifInfo->InterfaceGuid,
             wlan_intf_opcode_current_connection,
             NULL,
-            &connectInfoSize,
+            &bufSize,
             (PVOID*)&connInfo,
             &opCode) != ERROR_SUCCESS
         ) continue;
@@ -107,8 +110,8 @@ const char* ffDetectWifi(FFlist* result)
             (const char *)connInfo->wlanAssociationAttributes.dot11Ssid.ucSSID);
 
         for (size_t i = 0; i < sizeof(connInfo->wlanAssociationAttributes.dot11Bssid); i++)
-            ffStrbufAppendF(&item->conn.bssid, "%.2X-", connInfo->wlanAssociationAttributes.dot11Bssid[i]);
+            ffStrbufAppendF(&item->conn.bssid, "%.2X:", connInfo->wlanAssociationAttributes.dot11Bssid[i]);
-        ffStrbufTrimRight(&item->conn.bssid, '-');
+        ffStrbufTrimRight(&item->conn.bssid, ':');
 
         switch (connInfo->wlanAssociationAttributes.dot11PhyType)
         {
@@ -151,8 +154,8 @@ const char* ffDetectWifi(FFlist* result)
         }
 
         item->conn.signalQuality = connInfo->wlanAssociationAttributes.wlanSignalQuality;
-        item->conn.rxRate = connInfo->wlanAssociationAttributes.ulRxRate;
+        item->conn.rxRate = connInfo->wlanAssociationAttributes.ulRxRate / 1000.;
-        item->conn.txRate = connInfo->wlanAssociationAttributes.ulTxRate;
+        item->conn.txRate = connInfo->wlanAssociationAttributes.ulTxRate / 1000.;
 
         if(connInfo->wlanSecurityAttributes.bSecurityEnabled)
         {
@@ -189,7 +192,7 @@ const char* ffDetectWifi(FFlist* result)
                     ffStrbufAppendS(&item->conn.security, "OWE");
                     break;
                 case 11 /* DOT11_AUTH_ALGO_WPA3_ENT */:
-                    ffStrbufAppendS(&item->conn.security, "OWE-ENT");
+                    ffStrbufAppendS(&item->conn.security, "WPA3-ENT");
                     break;
                 default:
                     ffStrbufAppendF(&item->conn.security, "Unknown (%u)", (unsigned)connInfo->wlanSecurityAttributes.dot11AuthAlgorithm);
@@ -201,7 +204,34 @@ const char* ffDetectWifi(FFlist* result)
         else
             ffStrbufAppendS(&item->conn.security, "Insecure");
 
+        WLAN_BSS_LIST* bssList = NULL;
+        if (ffWlanGetNetworkBssList(hClient,
+            &ifInfo->InterfaceGuid,
+            &connInfo->wlanAssociationAttributes.dot11Ssid,
+            connInfo->wlanAssociationAttributes.dot11BssType,
+            connInfo->wlanSecurityAttributes.bSecurityEnabled,
+            NULL,
+            &bssList) == ERROR_SUCCESS && bssList->dwNumberOfItems > 0
+        ) {
+            item->conn.frequency = (uint16_t) (bssList->wlanBssEntries[0].ulChCenterFrequency / 1000);
+            ffWlanFreeMemory(bssList);
+        }
+
         ffWlanFreeMemory(connInfo);
+
+        ULONG* channelNumber = 0;
+        bufSize = sizeof(*channelNumber);
+        if(ffWlanQueryInterface(hClient,
+            &ifInfo->InterfaceGuid,
+            wlan_intf_opcode_channel_number,
+            NULL,
+            &bufSize,
+            (PVOID*)&channelNumber,
+            &opCode) == ERROR_SUCCESS
+        ) {
+            item->conn.channel = (uint16_t) *channelNumber;
+            ffWlanFreeMemory(channelNumber);
+        }
     }
 
 exit:

src/fastfetch.c

@@ -2,6 +2,7 @@
 #include "common/commandoption.h"
 #include "common/io/io.h"
 #include "common/jsonconfig.h"
+#include "common/printing.h"
 #include "detection/version/version.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
@@ -15,16 +16,65 @@
     #include "util/windows/getline.h"
 #endif
 
+static void printCommandFormatHelpJson(void)
+{
+    yyjson_mut_doc* doc = yyjson_mut_doc_new(NULL);
+    yyjson_mut_val* root = yyjson_mut_obj(doc);
+    yyjson_mut_doc_set_root(doc, root);
+
+    for (uint32_t i = 0; i <= 'Z' - 'A'; ++i)
+    {
+        for (FFModuleBaseInfo** modules = ffModuleInfos[i]; *modules; ++modules)
+        {
+            FFModuleBaseInfo* baseInfo = *modules;
+            if (!baseInfo->formatArgs.count) continue;
+
+            FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
+            ffStrbufLowerCase(&type);
+            ffStrbufAppendS(&type, "Format");
+
+            yyjson_mut_val* obj = yyjson_mut_obj(doc);
+            if (yyjson_mut_obj_add(root, yyjson_mut_strbuf(doc, &type), obj))
+            {
+                FF_STRBUF_AUTO_DESTROY content = ffStrbufCreateF("Output format of the module `%s`. See `-h format` for formatting syntax\n", baseInfo->name);
+                for (unsigned i = 0; i < baseInfo->formatArgs.count; i++)
+                {
+                    const FFModuleFormatArg* arg = &baseInfo->formatArgs.args[i];
+                    ffStrbufAppendF(&content, "    %u. {%s}: %s\n", i + 1, arg->name, arg->desc);
+                }
+                ffStrbufTrimRight(&content, '\n');
+                yyjson_mut_obj_add_strbuf(doc, obj, "description", &content);
+                yyjson_mut_obj_add_str(doc, obj, "type", "string");
+            }
+        }
+    }
+    yyjson_mut_write_fp(stdout, doc, YYJSON_WRITE_PRETTY, NULL, NULL);
+    putchar('\n');
+    yyjson_mut_doc_free(doc);
+}
+
 static void printCommandFormatHelp(const char* command)
 {
     FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateNS((uint32_t) (strlen(command) - strlen("-format")), command);
+    ffStrbufLowerCase(&type);
     for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(command[0]) - 'A']; *modules; ++modules)
     {
         FFModuleBaseInfo* baseInfo = *modules;
         if (ffStrbufIgnCaseEqualS(&type, baseInfo->name))
         {
-            if (baseInfo->printHelpFormat)
+            if (baseInfo->formatArgs.count > 0)
-                baseInfo->printHelpFormat();
+            {
+                printf("--%s-format:\n", type.chars);
+                printf("Sets the format string for %s output.\n", baseInfo->name);
+                puts("To see how a format string is constructed, take a look at \"fastfetch --help format\".");
+                puts("The following values are passed:");
+
+                for (unsigned i = 0; i < baseInfo->formatArgs.count; i++)
+                {
+                    const FFModuleFormatArg* arg = &baseInfo->formatArgs.args[i];
+                    printf("%16s {%u}: %s\n", arg->name, i + 1, arg->desc);
+                }
+            }
             else
                 fprintf(stderr, "Error: Module '%s' doesn't support output formatting\n", baseInfo->name);
             return;
@@ -252,6 +302,8 @@ static void printCommandHelp(const char* command)
         puts(FASTFETCH_DATATEXT_HELP_COLOR);
     else if(ffStrEqualsIgnCase(command, "format"))
         puts(FASTFETCH_DATATEXT_HELP_FORMAT);
+    else if(ffStrEqualsIgnCase(command, "format-json"))
+        printCommandFormatHelpJson();
     else if(ffCharIsEnglishAlphabet(command[0]) && ffStrEndsWithIgnCase(command, "-format")) // <module>-format
         printCommandFormatHelp(command);
     else if(!printSpecificCommandHelp(command))

src/logo/ascii/debian.txt

@@ -1,17 +1,17 @@
-       $2_,met$$$$$$$$$$gg.
+        $2_,met$$$$$$$$$$gg.
-    ,g$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$P.
+     ,g$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$P.
-  ,g$$$$P"         """Y$$$$.".
+   ,g$$$$P""       """Y$$$$.".
- ,$$$$P'               `$$$$$$.
+  ,$$$$P'              `$$$$$$.
 ',$$$$P       ,ggs.     `$$$$b:
 `d$$$$'     ,$P"'   $1.$2    $$$$$$
- $$$$P      d$'     $1,$2    $$$$$$P
+ $$$$P      d$'     $1,$2    $$$$P
- $$$$:      $$.   $1-$2    ,d$$$$'
+ $$$$:      $$$.   $1-$2    ,d$$$$'
  $$$$;      Y$b._   _,d$P'
  Y$$$$.    $1`.$2`"Y$$$$$$$$P"'
  `$$$$b      $1"-.__
-  $2`Y$$$$
+  $2`Y$$$$b
    `Y$$$$.
      `$$$$b.
        `Y$$$$b.
-          `"Y$$b._
+         `"Y$$b._
-             `"""
+             `""""

src/logo/ascii/linuxlite.txt

@@ -1,20 +1,20 @@
           ,xXc
       .l0MMMMMO
-   .kNMMMMMWMMMN,
+   .kNMMMMM$2W$1MMMN,
-   KMMMMMMKMMMMMMo
+   KMMMMMM$2K$1MMMMMMo
-  'MMMMMMNKMMMMMM:
+  'MMMMMMN$2K$1MMMMMM:
-  kMMMMMMOMMMMMMO
+  kMMMMMM$2O$1MMMMMMO
- .MMMMMMX0MMMMMW.
+ .MMMMMM$20$1XMMMMMW.
- oMMMMMMxWMMMMM:
+ oMMMMM$2x$1MMMMMMM:
- WMMMMMNkMMMMMO
+ WMMMMM$2x$1MMMMMMO
-:MMMMMMOXMMMMW
+:MMMMMM$2O$1XMMMMW
-.0MMMMMxMMMMM;
+.0MMMMM$2x$1MMMMM;
-:;cKMMWxMMMMO
+:;cKMMW$2x$1MMMMO
-'MMWMMXOMMMMl
+'MMWMMX$2O$1MMMMl
- kMMMMKOMMMMMX:
+ kMMMMK$2O$1MMMMMX:
- .WMMMMKOWMMM0c
+ .WMMMMK$2O$1WMMM0c
-  lMMMMMWO0MNd:'
+  lMMMMMW$2O$1WMNd:'
-   oollXMKXoxl;.
+   oollXMK$2o$1Xxl;.
-     ':. .: .'
+     ':. .:$2 .$1'
-              ..
+              $2..
                 .

src/logo/ascii/linuxlite_small.txt

@@ -1,7 +1,7 @@
-${c1}   /\\
+    /\\
-  /  \\
+   /  \\
- / ${c2}/ ${c1}/
+  / ${c2}/ ${c1}/
-> ${c2}/ ${c1}/
+ > ${c2}/ ${c1}/
 \\ ${c2}\\ ${c1}\\
  \\_${c2}\\${c1}_\\
-${c2}    \\
+${c2}     \\

src/logo/ascii/midos.txt

@@ -1,20 +1,20 @@
-              .:=+*#%%@@@@@@%%#*+=:.
+             ▁▂▃▄▅▆▇▇████▇▇▆▅▄▃▂▁
-          .=*%@@@@@@@@@@@@@@@@@@@@@@%*=:
+          ▃▅▇████████████████████▇▅▃
-       .=%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%+.
+       ▂▅████████████████████████████▅▁
-     :*@@@@@@@@@@@@@@@@@$2++$1%@@@@@@@@@@@@@@@@#-
+     ▗▟██████████████▛▀▀▜██████████████▙▖
-   .*@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@#.
+   ▗▟████████████████▌  ▐████████████████▙▖
-  -%@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@-
+  ▗██████████████████▌  ▐██████████████████▖
- -@@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@@=
+ ▗███████████████████▌  ▐███████████████████▖
-:@@@@@@@@@@@@@@@@@%%@@@%$2..$1#@@@@#@@@@@@@@@@@@@@@@@:
+▕███████████████▀▘ ██▌  ▐██ ▝▀███████████████▏
-*@@@@@@@@@@@@#$2*=:..$1*@@@%$2..$1#@@@#$2..:=+$1#@@@@@@@@@@@@*
+▐██████████▛▀▀    ▂██▌  ▐██▂    ▀▀▜██████████▌
-%@@@@@@@#+$2=:...-+$1#@@@@@%$2..$1#@@@@@#$2+=:..:-$1+#@@@@@@@%
+███████▀▀     ▁▄▆████▌  ▐████▆▄▁     ▀▀███████
-%@@@@@$2:..:=+-..-+$1#@@@@@%$2..$1#@@@@@%$2+-..-+=:..:$1@@@@@@
+█████    ▂▄▂  ▔▀▜████▌  ▐████▛▀▔  ▂▄▂    █████
-*@@@@@$2*%$1@@@@@@%$2+-..$1#@@@%$2..$1#@@@%$2..-+$1#@@@@@@$2%*$1@@@@@*
+▐████▄▄▆█████▄▂  ▔▀██▌  ▐██▀▔  ▂▄█████▆▄▄████▌
-:@@@@@@@@@@@@@@@@@$2#%$1@@@%$2..$1#@@@$2%#$1@@@@@@@@@@@@@@@@@:
+▕██████████████▇▄▂ ██▌  ▐██ ▂▄▇██████████████▏
- =@@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@@=
+ ▝███████████████████▌  ▐███████████████████▘
-  -@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@=
+  ▝██████████████████▌  ▐██████████████████▘
-   .*@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@#:
+   ▝▜████████████████▌  ▐████████████████▛▘
-     :*@@@@@@@@@@@@@@@@@$2==$1%@@@@@@@@@@@@@@@@#-.
+     ▝▜██████████████▙▄▄▟██████████████▛▘
-       .+%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%+:
+       ▔▀▜██████████████████████████▛▀▔
-          :=*%@@@@@@@@@@@@@@@@@@@@@@%*=:.
+          ▔▀▜████████████████████▛▀▔
-              .-=+*#%%@@@@@@%%#*+=-.
+              ▔▔▀▀▀▜██████▛▀▀▀▔▔

src/logo/ascii/midos_old.txt

@@ -0,0 +1,20 @@
+              .:=+*#%%@@@@@@%%#*+=:.
+          .=*%@@@@@@@@@@@@@@@@@@@@@@%*=:
+       .=%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%+.
+     :*@@@@@@@@@@@@@@@@@$2++$1%@@@@@@@@@@@@@@@@#-
+   .*@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@#.
+  -%@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@-
+ -@@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@@=
+:@@@@@@@@@@@@@@@@@%%@@@%$2..$1#@@@@#@@@@@@@@@@@@@@@@@:
+*@@@@@@@@@@@@#$2*=:..$1*@@@%$2..$1#@@@#$2..:=+$1#@@@@@@@@@@@@*
+%@@@@@@@#+$2=:...-+$1#@@@@@%$2..$1#@@@@@#$2+=:..:-$1+#@@@@@@@%
+%@@@@@$2:..:=+-..-+$1#@@@@@%$2..$1#@@@@@%$2+-..-+=:..:$1@@@@@@
+*@@@@@$2*%$1@@@@@@%$2+-..$1#@@@%$2..$1#@@@%$2..-+$1#@@@@@@$2%*$1@@@@@*
+:@@@@@@@@@@@@@@@@@$2#%$1@@@%$2..$1#@@@$2%#$1@@@@@@@@@@@@@@@@@:
+ =@@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@@=
+  -@@@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@@@=
+   .*@@@@@@@@@@@@@@@@@@%$2..$1#@@@@@@@@@@@@@@@@@@#:
+     :*@@@@@@@@@@@@@@@@@$2==$1%@@@@@@@@@@@@@@@@#-.
+       .+%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%+:
+          :=*%@@@@@@@@@@@@@@@@@@@@@@%*=:.
+              .-=+*#%%@@@@@@%%#*+=-.

src/logo/ascii/serpent_os.txt

@@ -0,0 +1,18 @@
+            ,dKNWWNKOxo;.
+          ;xKXOdoloOWMWX0d:.
+        .dNNd'     cNMMMMNKOx;.
+       .dWNo       .:oxO000KXKl.
+       .OMNl             .....
+        oNMXd,.
+        .lKWMNKkdollccc:::;;;,'..
+          .;ox0KNWWMMMMMMMMWWWWNK0xl,.
+               ..,;:ccloodxO0KNWMMMMNOc.
+                             .';lxKWMMWk'
+      ..,:ccc:,.                  .oXMMMO
+   .:d0NWWWWWMWXOo,.     .,cc:;,,'..oWMMW
+ .c0WW0xl:;,;cd0NMNO:'..ldl;.    .'.:XMMM
+ xWMKc.        .;OWMWX0xl.         .dWMMK
+ WMWd.           .oKWMMXx,        .dNMMXc
+ NMMK:.      ..:oxo:oOXMMNOdc:;;cxKWMWO;
+ ;kXWN0xooodkOOko;.   .lONMMMMWWMMWKx;.
+   ,okKXXXKOxc'.        .:kKWMMWXOl'

src/logo/ascii/ultramarine_small.txt

@@ -0,0 +1,14 @@
+       @@@@@@@@@@@@
+    @@@@@@@@@@@@@@@@@@
+  @@@@@@@@@@@@@@@@@@@@@@
+ @@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@*=+*%@@@@@@@@@@@@
+@@@@@@@@@@:   :#@@@@@@@@@@
+@@@@@@@@@#      -#@@@@@@@@
+@@%###*=.         :=*#@@@@
+@@=                    =@@
+ @@=                  -@@
+  @@*:              :*@@
+    @%*=:        :=*@@
+       @@@%%##%%@@@

src/logo/ascii/windows_2025.txt

@@ -0,0 +1,17 @@
+$1      ##%%%%%%%%%  $2%%%%%%%%%##
+$1    ###%%%%%%%%%%  $2%%%%%%%%%%###
+$1  ####%%%%%%%%%%%  $2%%%%%%%%%%%####
+$1 ##%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%##
+$1#%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%#
+$1%%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%%
+$1%%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%%
+$1%%%%%%%%%%%%%%%%%  $2#%%%%%%%%%%%%%%%%
+
+$3%%%%%%%%%%%%%%%%%  $4#%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%#
+$3 ###%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%##
+$3  ####%%%%%%%%%%%  $4%%%%%%%%%%%#%####
+$3    ##%#%%%%%%%%%  $4%%%%%%%%%%%######
+$3      ##%%%%%%%%%  $4%%%%%%%%%########

src/logo/builtin.c

@@ -2477,10 +2477,10 @@ static const FFlogo L[] = {
         .names = {"LinuxLite", "Linux Lite", "linux_lite"},
         .lines = FASTFETCH_DATATEXT_LOGO_LINUXLITE,
         .colors = {
-            FF_COLOR_FG_YELLOW,
+            FF_COLOR_FG_GREEN,
             FF_COLOR_FG_WHITE,
         },
-        .colorKeys = FF_COLOR_FG_YELLOW,
+        .colorKeys = FF_COLOR_FG_GREEN,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
     // LinuxLightSmall
@@ -2489,10 +2489,10 @@ static const FFlogo L[] = {
         .type = FF_LOGO_LINE_TYPE_SMALL_BIT,
         .lines = FASTFETCH_DATATEXT_LOGO_LINUXLITE_SMALL,
         .colors = {
-            FF_COLOR_FG_YELLOW,
+            FF_COLOR_FG_BLUE,
             FF_COLOR_FG_WHITE,
         },
-        .colorKeys = FF_COLOR_FG_YELLOW,
+        .colorKeys = FF_COLOR_FG_BLUE,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
     // LinuxMint
@@ -2837,6 +2837,17 @@ static const FFlogo M[] = {
     {
         .names = {"MidOS"},
         .lines = FASTFETCH_DATATEXT_LOGO_MIDOS,
+        .colors = {
+            FF_COLOR_FG_LIGHT_BLACK,
+        },
+        .colorKeys = FF_COLOR_FG_LIGHT_BLACK,
+        .colorTitle = FF_COLOR_FG_WHITE,
+    },
+    // MidOSOld
+    {
+        .names = {"MidOS_old"},
+        .lines = FASTFETCH_DATATEXT_LOGO_MIDOS_OLD,
+        .type = FF_LOGO_LINE_TYPE_ALTER_BIT,
         .colors = {
             FF_COLOR_FG_LIGHT_BLACK,
             FF_COLOR_FG_WHITE,
@@ -4041,6 +4052,14 @@ static const FFlogo S[] = {
             FF_COLOR_FG_RED,
         },
     },
+    // Serpent OS
+    {
+        .names = {"Serpent OS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_SERPENT_OS,
+        .colors = {
+            FF_COLOR_FG_WHITE,
+        },
+    },
     // Semc
     {
         .names = {"semc"},
@@ -4616,6 +4635,15 @@ static const FFlogo U[] = {
             FF_COLOR_FG_WHITE,
         },
     },
+    // Ultramarine Small
+    {
+        .names = {"Ultramarine_small"},
+        .lines = FASTFETCH_DATATEXT_LOGO_ULTRAMARINE_SMALL,
+        .colors = {
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_WHITE,
+        },
+    },
     // Unifi
     {
         .names = {"Unifi"},
@@ -4809,6 +4837,19 @@ static const FFlogo W[] = {
             FF_COLOR_FG_WHITE,
         },
     },
+    // Windows2025
+    {
+        .names = {"Windows Server 2025"},
+        .lines = FASTFETCH_DATATEXT_LOGO_WINDOWS_2025,
+        .colors = {
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_BLUE,
+        },
+        .colorKeys = FF_COLOR_FG_YELLOW,
+        .colorTitle = FF_COLOR_FG_CYAN,
+    },
     // Windows11
     {
         .names = {"Windows 11", "Windows Server 2022"},

src/modules/battery/battery.c

@@ -7,8 +7,6 @@
 #include "modules/battery/battery.h"
 #include "util/stringUtils.h"
 
-#define FF_BATTERY_NUM_FORMAT_ARGS 14
-
 static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index)
 {
     FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
@@ -22,7 +20,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
     else
     {
         ffStrbufClear(&key);
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
             FF_FORMAT_ARG(index, "index"),
             FF_FORMAT_ARG(result->modelName, "name"),
         }));
@@ -105,7 +103,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
         FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
         ffTempsAppendNum(result->temperature, &tempStr, options->tempConfig, &options->moduleArgs);
 
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BATTERY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
             FF_FORMAT_ARG(result->manufacturer, "manufacturer"),
             FF_FORMAT_ARG(result->modelName, "model-name"),
             FF_FORMAT_ARG(result->technology, "technology"),
@@ -270,39 +268,35 @@ void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc,
     }
 }
 
-void ffPrintBatteryHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BATTERY_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BATTERY_MODULE_NAME, "{4} ({12} hours {13} mins) [{5}]", FF_BATTERY_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print battery capacity, status, etc",
-        "Battery manufacturer - manufacturer",
+    .parseCommandOptions = (void*) ffParseBatteryCommandOptions,
-        "Battery model name - model-name",
+    .parseJsonObject = (void*) ffParseBatteryJsonObject,
-        "Battery technology - technology",
+    .printModule = (void*) ffPrintBattery,
-        "Battery capacity (percentage num) - capacity",
+    .generateJsonResult = (void*) ffGenerateBatteryJsonResult,
-        "Battery status - status",
+    .generateJsonConfig = (void*) ffGenerateBatteryJsonConfig,
-        "Battery temperature (formatted) - temperature",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Battery cycle count - cycle-count",
+        {"Battery manufacturer", "manufacturer"},
-        "Battery serial number - serial",
+        {"Battery model name", "model-name"},
-        "Battery manufactor date - manufacture-date",
+        {"Battery technology", "technology"},
-        "Battery capacity (percentage bar) - capacity-bar",
+        {"Battery capacity (percentage num)", "capacity"},
-        "Battery time remaining days - time-days",
+        {"Battery status", "status"},
-        "Battery time remaining hours - time-hours",
+        {"Battery temperature (formatted)", "temperature"},
-        "Battery time remaining minutes - time-minutes",
+        {"Battery cycle count", "cycle-count"},
-        "Battery time remaining seconds - time-seconds",
+        {"Battery serial number", "serial"},
-    }));
+        {"Battery manufactor date", "manufacture-date"},
-}
+        {"Battery capacity (percentage bar)", "capacity-bar"},
+        {"Battery time remaining days", "time-days"},
+        {"Battery time remaining hours", "time-hours"},
+        {"Battery time remaining minutes", "time-minutes"},
+        {"Battery time remaining seconds", "time-seconds"},
+    }))
+};
 
 void ffInitBatteryOptions(FFBatteryOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BATTERY_MODULE_NAME,
-        "Print battery capacity, status, etc",
-        ffParseBatteryCommandOptions,
-        ffParseBatteryJsonObject,
-        ffPrintBattery,
-        ffGenerateBatteryJsonResult,
-        ffPrintBatteryHelpFormat,
-        ffGenerateBatteryJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     options->temp = false;
     options->tempConfig = (FFColorRangeConfig) { 60, 80 };

src/modules/bios/bios.c

@@ -4,8 +4,6 @@
 #include "modules/bios/bios.h"
 #include "util/stringUtils.h"
 
-#define FF_BIOS_NUM_FORMAT_ARGS 5
-
 void ffPrintBios(FFBiosOptions* options)
 {
     FFBiosResult bios;
@@ -43,7 +41,7 @@ void ffPrintBios(FFBiosOptions* options)
     else
     {
         ffStrbufClear(&key);
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
             FF_FORMAT_ARG(bios.type, "type"),
             FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
         }));
@@ -60,7 +58,7 @@ void ffPrintBios(FFBiosOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
             FF_FORMAT_ARG(bios.date, "date"),
             FF_FORMAT_ARG(bios.release, "release"),
             FF_FORMAT_ARG(bios.vendor, "vendor"),
@@ -144,30 +142,26 @@ exit:
     ffStrbufDestroy(&bios.type);
 }
 
-void ffPrintBiosHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BIOS_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BIOS_MODULE_NAME, "{4} ({2})", FF_BIOS_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print information of 1st-stage bootloader (name, version, release date, etc)",
-        "bios date - date",
+    .parseCommandOptions = (void*) ffParseBiosCommandOptions,
-        "bios release - release",
+    .parseJsonObject = (void*) ffParseBiosJsonObject,
-        "bios vendor - vendor",
+    .printModule = (void*) ffPrintBios,
-        "bios version - version",
+    .generateJsonResult = (void*) ffGenerateBiosJsonResult,
-        "firmware type - type",
+    .generateJsonConfig = (void*) ffGenerateBiosJsonConfig,
-    }));
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-}
+        {"Bios date", "date"},
+        {"Bios release", "release"},
+        {"Bios vendor", "vendor"},
+        {"Bios version", "version"},
+        {"Firmware type", "type"},
+    }))
+};
 
 void ffInitBiosOptions(FFBiosOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BIOS_MODULE_NAME,
-        "Print information of 1st-stage bootloader (name, version, release date, etc)",
-        ffParseBiosCommandOptions,
-        ffParseBiosJsonObject,
-        ffPrintBios,
-        ffGenerateBiosJsonResult,
-        ffPrintBiosHelpFormat,
-        ffGenerateBiosJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/bluetooth/bluetooth.c

@@ -5,8 +5,6 @@
 #include "modules/bluetooth/bluetooth.h"
 #include "util/stringUtils.h"
 
-#define FF_BLUETOOTH_NUM_FORMAT_ARGS 6
-
 static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* device, uint8_t index)
 {
     FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
@@ -47,7 +45,7 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* de
         if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             ffPercentAppendBar(&percentageBar, device->battery, options->percent, &options->moduleArgs);
 
-        FF_PRINT_FORMAT_CHECKED(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BLUETOOTH_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(device->name, "name"),
             FF_FORMAT_ARG(device->address, "address"),
             FF_FORMAT_ARG(device->type, "type"),
@@ -188,31 +186,27 @@ void ffGenerateBluetoothJsonResult(FF_MAYBE_UNUSED FFBluetoothOptions* options,
     }
 }
 
-void ffPrintBluetoothHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BLUETOOTH_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BLUETOOTH_MODULE_NAME, "{1} ({4})", FF_BLUETOOTH_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "List (connected) bluetooth devices",
-        "Name - device name",
+    .parseCommandOptions = (void*) ffParseBluetoothCommandOptions,
-        "Address - remote device address",
+    .parseJsonObject = (void*) ffParseBluetoothJsonObject,
-        "Type - type",
+    .printModule = (void*) ffPrintBluetooth,
-        "Battery percentage number - battery-percentage",
+    .generateJsonResult = (void*) ffGenerateBluetoothJsonResult,
-        "Is connected - connected",
+    .generateJsonConfig = (void*) ffGenerateBluetoothJsonConfig,
-        "Battery percentage bar - battery-percentage-bar",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-    }));
+        {"Name", "name"},
-}
+        {"Address", "address"},
+        {"Type", "type"},
+        {"Battery percentage number", "battery-percentage"},
+        {"Is connected", "connected"},
+        {"Battery percentage bar", "battery-percentage-bar"},
+    }))
+};
 
 void ffInitBluetoothOptions(FFBluetoothOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BLUETOOTH_MODULE_NAME,
-        "List (connected) bluetooth devices",
-        ffParseBluetoothCommandOptions,
-        ffParseBluetoothJsonObject,
-        ffPrintBluetooth,
-        ffGenerateBluetoothJsonResult,
-        ffPrintBluetoothHelpFormat,
-        ffGenerateBluetoothJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     options->showDisconnected = false;
     options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };

src/modules/bluetoothradio/bluetoothradio.c

@@ -5,7 +5,6 @@
 #include "modules/bluetoothradio/bluetoothradio.h"
 #include "util/stringUtils.h"
 
-#define FF_BLUETOOTHRADIO_NUM_FORMAT_ARGS 8
 #define FF_BLUETOOTHRADIO_DISPLAY_NAME "Bluetooth Radio"
 
 static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadioResult* radio, uint8_t index)
@@ -17,7 +16,7 @@ static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadio
     }
     else
     {
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
             FF_FORMAT_ARG(index, "index"),
             FF_FORMAT_ARG(radio->name, "name"),
             FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
@@ -55,7 +54,7 @@ static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadio
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BLUETOOTHRADIO_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
             FF_FORMAT_ARG(radio->name, "name"),
             FF_FORMAT_ARG(radio->address, "address"),
             FF_FORMAT_ARG(radio->lmpVersion, "lmp-version"),
@@ -181,33 +180,29 @@ void ffGenerateBluetoothRadioJsonResult(FF_MAYBE_UNUSED FFBluetoothRadioOptions*
     }
 }
 
-void ffPrintBluetoothRadioHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BLUETOOTHRADIO_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BLUETOOTHRADIO_MODULE_NAME, "Bluetooth {5} ({6})", FF_BLUETOOTHRADIO_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "List bluetooth radios width supported version and vendor",
-        "Radio name for discovering - name",
+    .parseCommandOptions = (void*) ffParseBluetoothRadioCommandOptions,
-        "Address - local radio address",
+    .parseJsonObject = (void*) ffParseBluetoothRadioJsonObject,
-        "LMP version - lmp-version",
+    .printModule = (void*) ffPrintBluetoothRadio,
-        "LMP subversion - lmp-subversion",
+    .generateJsonResult = (void*) ffGenerateBluetoothRadioJsonResult,
-        "Bluetooth version - version",
+    .generateJsonConfig = (void*) ffGenerateBluetoothRadioJsonConfig,
-        "Vendor - vendor",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Discoverable - discoverable",
+        {"Radio name for discovering", "name"},
-        "Connectable / Pairable - connectable",
+        {"Address", "address"},
-    }));
+        {"LMP version", "lmp-version"},
-}
+        {"LMP subversion", "lmp-subversion"},
+        {"Bluetooth version", "version"},
+        {"Vendor", "vendor"},
+        {"Discoverable", "discoverable"},
+        {"Connectable / Pairable", "connectable"},
+    }))
+};
 
 void ffInitBluetoothRadioOptions(FFBluetoothRadioOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BLUETOOTHRADIO_MODULE_NAME,
-        "List bluetooth radios width supported version and vendor",
-        ffParseBluetoothRadioCommandOptions,
-        ffParseBluetoothRadioJsonObject,
-        ffPrintBluetoothRadio,
-        ffGenerateBluetoothRadioJsonResult,
-        ffPrintBluetoothRadioHelpFormat,
-        ffGenerateBluetoothRadioJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰐻");
 }
 

src/modules/board/board.c

@@ -4,8 +4,6 @@
 #include "modules/board/board.h"
 #include "util/stringUtils.h"
 
-#define FF_BOARD_NUM_FORMAT_ARGS 4
-
 void ffPrintBoard(FFBoardOptions* options)
 {
     FFBoardResult result;
@@ -37,7 +35,7 @@ void ffPrintBoard(FFBoardOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BOARD_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(result.name, "name"),
             FF_FORMAT_ARG(result.vendor, "vendor"),
             FF_FORMAT_ARG(result.version, "version"),
@@ -122,29 +120,25 @@ exit:
     ffStrbufDestroy(&board.serial);
 }
 
-void ffPrintBoardHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BOARD_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BOARD_MODULE_NAME, "{1} ({3})", FF_BOARD_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print motherboard name and other info",
-        "board name - name",
+    .parseCommandOptions = (void*) ffParseBoardCommandOptions,
-        "board vendor - vendor",
+    .parseJsonObject = (void*) ffParseBoardJsonObject,
-        "board version - version",
+    .printModule = (void*) ffPrintBoard,
-        "board serial number - serial",
+    .generateJsonResult = (void*) ffGenerateBoardJsonResult,
-    }));
+    .generateJsonConfig = (void*) ffGenerateBoardJsonConfig,
-}
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Board name", "name"},
+        {"Board vendor", "vendor"},
+        {"Board version", "version"},
+        {"Board serial number", "serial"},
+    }))
+};
 
 void ffInitBoardOptions(FFBoardOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BOARD_MODULE_NAME,
-        "Print motherboard name and other info",
-        ffParseBoardCommandOptions,
-        ffParseBoardJsonObject,
-        ffPrintBoard,
-        ffGenerateBoardJsonResult,
-        ffPrintBoardHelpFormat,
-        ffGenerateBoardJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/bootmgr/bootmgr.c

@@ -4,8 +4,6 @@
 #include "modules/bootmgr/bootmgr.h"
 #include "util/stringUtils.h"
 
-#define FF_BOOTMGR_NUM_FORMAT_ARGS 4
-
 void ffPrintBootmgr(FFBootmgrOptions* options)
 {
     FFBootmgrResult bootmgr = {
@@ -39,7 +37,7 @@ void ffPrintBootmgr(FFBootmgrOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BOOTMGR_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(bootmgr.name, "name"),
             FF_FORMAT_ARG(bootmgr.firmware, "firmware-path"),
             FF_FORMAT_ARG(firmwareName, "firmware-name"),
@@ -111,29 +109,25 @@ exit:
     ffStrbufDestroy(&bootmgr.firmware);
 }
 
-void ffPrintBootmgrHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BOOTMGR_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BOOTMGR_MODULE_NAME, "{4} ({2})", FF_BOOTMGR_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print information of 2nd-stage bootloader (name, firmware, etc)",
-        "Name / description - name",
+    .parseCommandOptions = (void*) ffParseBootmgrCommandOptions,
-        "Firmware file path - firmware-path",
+    .parseJsonObject = (void*) ffParseBootmgrJsonObject,
-        "Firmware file name - firmware-name",
+    .printModule = (void*) ffPrintBootmgr,
-        "Is secure boot enabled - secure-boot",
+    .generateJsonResult = (void*) ffGenerateBootmgrJsonResult,
-    }));
+    .generateJsonConfig = (void*) ffGenerateBootmgrJsonConfig,
-}
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Name / description", "name"},
+        {"Firmware file path", "firmware-path"},
+        {"Firmware file name", "firmware-name"},
+        {"Is secure boot enabled", "secure-boot"},
+    }))
+};
 
 void ffInitBootmgrOptions(FFBootmgrOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BOOTMGR_MODULE_NAME,
-        "Print information of 2nd-stage bootloader (name, firmware, etc)",
-        ffParseBootmgrCommandOptions,
-        ffParseBootmgrJsonObject,
-        ffPrintBootmgr,
-        ffGenerateBootmgrJsonResult,
-        ffPrintBootmgrHelpFormat,
-        ffGenerateBootmgrJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/break/break.c

@@ -16,19 +16,17 @@ void ffParseBreakJsonObject(FF_MAYBE_UNUSED FFBreakOptions* options, FF_MAYBE_UN
 {
 }
 
+static FFModuleBaseInfo ffModuleInfo = {
+    .name = FF_BREAK_MODULE_NAME,
+    .description = "Print a empty line",
+    .parseCommandOptions = (void*) ffParseBreakCommandOptions,
+    .parseJsonObject = (void*) ffParseBreakJsonObject,
+    .printModule = (void*) ffPrintBreak,
+};
+
 void ffInitBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BREAK_MODULE_NAME,
-        "Print a empty line",
-        ffParseBreakCommandOptions,
-        ffParseBreakJsonObject,
-        ffPrintBreak,
-        NULL,
-        NULL,
-        NULL
-    );
 }
 
 void ffDestroyBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options)

src/modules/brightness/brightness.c

@@ -5,8 +5,6 @@
 #include "modules/brightness/brightness.h"
 #include "util/stringUtils.h"
 
-#define FF_BRIGHTNESS_NUM_FORMAT_ARGS 6
-
 void ffPrintBrightness(FFBrightnessOptions* options)
 {
     FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFBrightnessResult));
@@ -57,7 +55,7 @@ void ffPrintBrightness(FFBrightnessOptions* options)
         else
         {
             uint32_t moduleIndex = result.length == 1 ? 0 : index + 1;
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
                 FF_FORMAT_ARG(moduleIndex, "index"),
                 FF_FORMAT_ARG(item->name, "name"),
                 FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
@@ -95,7 +93,7 @@ void ffPrintBrightness(FFBrightnessOptions* options)
             if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
                 ffPercentAppendBar(&valueBar, percent, options->percent, &options->moduleArgs);
 
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BRIGHTNESS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
                 FF_FORMAT_ARG(valueNum, "percentage"),
                 FF_FORMAT_ARG(item->name, "name"),
                 FF_FORMAT_ARG(item->max, "max"),
@@ -214,31 +212,27 @@ void ffGenerateBrightnessJsonResult(FF_MAYBE_UNUSED FFBrightnessOptions* options
     }
 }
 
-void ffPrintBrightnessHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BRIGHTNESS_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BRIGHTNESS_MODULE_NAME, "{1}", FF_BRIGHTNESS_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print current brightness level of your monitors",
-        "Screen brightness (percentage num) - percentage",
+    .parseCommandOptions = (void*) ffParseBrightnessCommandOptions,
-        "Screen name - name",
+    .parseJsonObject = (void*) ffParseBrightnessJsonObject,
-        "Maximum brightness value - max",
+    .printModule = (void*) ffPrintBrightness,
-        "Minimum brightness value - min",
+    .generateJsonResult = (void*) ffGenerateBrightnessJsonResult,
-        "Current brightness value - current",
+    .generateJsonConfig = (void*) ffGenerateBrightnessJsonConfig,
-        "Screen brightness (percentage bar) - percentage-bar",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-    }));
+        {"Screen brightness (percentage num)", "percentage"},
-}
+        {"Screen name", "name"},
+        {"Maximum brightness value", "max"},
+        {"Minimum brightness value", "min"},
+        {"Current brightness value", "current"},
+        {"Screen brightness (percentage bar)", "percentage-bar"},
+    }))
+};
 
 void ffInitBrightnessOptions(FFBrightnessOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BRIGHTNESS_MODULE_NAME,
-        "Print current brightness level of your monitors",
-        ffParseBrightnessCommandOptions,
-        ffParseBrightnessJsonObject,
-        ffPrintBrightness,
-        ffGenerateBrightnessJsonResult,
-        ffPrintBrightnessHelpFormat,
-        ffGenerateBrightnessJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰯪");
 
     options->ddcciSleep = 10;

src/modules/btrfs/btrfs.c

@@ -5,8 +5,6 @@
 #include "modules/btrfs/btrfs.h"
 #include "util/stringUtils.h"
 
-#define FF_BTRFS_NUM_FORMAT_ARGS 13
-
 static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t index)
 {
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
@@ -20,7 +18,7 @@ static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t i
     else
     {
         ffStrbufClear(&buffer);
-        FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, ((FFformatarg[]) {
             FF_FORMAT_ARG(index, "index"),
             FF_FORMAT_ARG(result->name, "name"),
             FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
@@ -80,7 +78,7 @@ static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t i
         FF_STRBUF_AUTO_DESTROY sectorSizePretty = ffStrbufCreate();
         ffParseSize(result->sectorSize, &sectorSizePretty);
 
-        FF_PRINT_FORMAT_CHECKED(buffer.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BTRFS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(buffer.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
             FF_FORMAT_ARG(result->name, "name"),
             FF_FORMAT_ARG(result->uuid, "uuid"),
             FF_FORMAT_ARG(result->devices, "devices"),
@@ -218,38 +216,34 @@ void ffGenerateBtrfsJsonResult(FF_MAYBE_UNUSED FFBtrfsOptions* options, yyjson_m
     }
 }
 
-void ffPrintBtrfsHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_BTRFS_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BTRFS_MODULE_NAME, "{5} / {7} ({8}, {9} allocated)", FF_BTRFS_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print Linux BTRFS volumes",
-        "Name / Label - name",
+    .parseCommandOptions = (void*) ffParseBtrfsCommandOptions,
-        "UUID - uuid",
+    .parseJsonObject = (void*) ffParseBtrfsJsonObject,
-        "Associated devices - devices",
+    .printModule = (void*) ffPrintBtrfs,
-        "Enabled features - features",
+    .generateJsonResult = (void*) ffGenerateBtrfsJsonResult,
-        "Size used - used",
+    .generateJsonConfig = (void*) ffGenerateBtrfsJsonConfig,
-        "Size allocated - allocated",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Size total - total",
+        {"Name / Label", "name"},
-        "Used percentage num - used-percentage",
+        {"UUID", "uuid"},
-        "Allocated percentage num - allocated-percentage",
+        {"Associated devices", "devices"},
-        "Used percentage bar - used-percentage-bar",
+        {"Enabled features", "features"},
-        "Allocated percentage bar - allocated-percentage-bar",
+        {"Size used", "used"},
-        "Node size - node-size",
+        {"Size allocated", "allocated"},
-        "Sector size - sector-size",
+        {"Size total", "total"},
-    }));
+        {"Used percentage num", "used-percentage"},
-}
+        {"Allocated percentage num", "allocated-percentage"},
+        {"Used percentage bar", "used-percentage-bar"},
+        {"Allocated percentage bar", "allocated-percentage-bar"},
+        {"Node size", "node-size"},
+        {"Sector size", "sector-size"},
+    }))
+};
 
 void ffInitBtrfsOptions(FFBtrfsOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_BTRFS_MODULE_NAME,
-        "Print BTRFS volumes",
-        ffParseBtrfsCommandOptions,
-        ffParseBtrfsJsonObject,
-        ffPrintBtrfs,
-        ffGenerateBtrfsJsonResult,
-        ffPrintBtrfsHelpFormat,
-        ffGenerateBtrfsJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󱑛");
     options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
 }

src/modules/camera/camera.c

@@ -5,8 +5,6 @@
 #include "modules/camera/camera.h"
 #include "util/stringUtils.h"
 
-#define FF_CAMERA_NUM_FORMAT_ARGS 6
-
 static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index)
 {
     if(options->moduleArgs.outputFormat.length == 0)
@@ -27,7 +25,7 @@ static void printDevice(FFCameraOptions* options, const FFCameraResult* device,
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CAMERA_NUM_FORMAT_ARGS, (((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (((FFformatarg[]) {
             FF_FORMAT_ARG(device->name, "name"),
             FF_FORMAT_ARG(device->vendor, "vendor"),
             FF_FORMAT_ARG(device->colorspace, "colorspace"),
@@ -136,31 +134,27 @@ void ffGenerateCameraJsonResult(FF_MAYBE_UNUSED FFCameraOptions* options, yyjson
     }
 }
 
-void ffPrintCameraHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CAMERA_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CAMERA_MODULE_NAME, "{1} ({4}px x {5}px)", FF_CAMERA_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print available cameras",
-        "Device name - name",
+    .parseCommandOptions = (void*) ffParseCameraCommandOptions,
-        "Vendor - vendor",
+    .parseJsonObject = (void*) ffParseCameraJsonObject,
-        "Color space - colorspace",
+    .printModule = (void*) ffPrintCamera,
-        "Identifier - id",
+    .generateJsonResult = (void*) ffGenerateCameraJsonResult,
-        "Width (in px) - width",
+    .generateJsonConfig = (void*) ffGenerateCameraJsonConfig,
-        "Height (in px) - height",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-    }));
+        {"Device name", "name"},
-}
+        {"Vendor", "vendor"},
+        {"Color space", "colorspace"},
+        {"Identifier", "id"},
+        {"Width (in px)", "width"},
+        {"Height (in px)", "height"},
+    }))
+};
 
 void ffInitCameraOptions(FFCameraOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CAMERA_MODULE_NAME,
-        "Print available cameras",
-        ffParseCameraCommandOptions,
-        ffParseCameraJsonObject,
-        ffPrintCamera,
-        ffGenerateCameraJsonResult,
-        ffPrintCameraHelpFormat,
-        ffGenerateCameraJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰄀");
 }
 

src/modules/chassis/chassis.c

@@ -4,8 +4,6 @@
 #include "modules/chassis/chassis.h"
 #include "util/stringUtils.h"
 
-#define FF_CHASSIS_NUM_FORMAT_ARGS 4
-
 void ffPrintChassis(FFChassisOptions* options)
 {
     FFChassisResult result;
@@ -38,7 +36,7 @@ void ffPrintChassis(FFChassisOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CHASSIS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(result.type, "type"),
             FF_FORMAT_ARG(result.vendor, "vendor"),
             FF_FORMAT_ARG(result.version, "version"),
@@ -123,29 +121,25 @@ exit:
     ffStrbufDestroy(&result.serial);
 }
 
-void ffPrintChassisHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CHASSIS_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CHASSIS_MODULE_NAME, "{1}", FF_CHASSIS_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print chassis type (desktop, laptop, etc)",
-        "chassis type - type",
+    .parseCommandOptions = (void*) ffParseChassisCommandOptions,
-        "chassis vendor - vendor",
+    .parseJsonObject = (void*) ffParseChassisJsonObject,
-        "chassis version - version",
+    .printModule = (void*) ffPrintChassis,
-        "chassis serial number - serial",
+    .generateJsonResult = (void*) ffGenerateChassisJsonResult,
-    }));
+    .generateJsonConfig = (void*) ffGenerateChassisJsonConfig,
-}
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Chassis type", "type"},
+        {"Chassis vendor", "vendor"},
+        {"Chassis version", "version"},
+        {"Chassis serial number", "serial"},
+    })),
+};
 
 void ffInitChassisOptions(FFChassisOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CHASSIS_MODULE_NAME,
-        "Print chassis type (desktop, laptop, etc)",
-        ffParseChassisCommandOptions,
-        ffParseChassisJsonObject,
-        ffPrintChassis,
-        ffGenerateChassisJsonResult,
-        ffPrintChassisHelpFormat,
-        ffGenerateChassisJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/colors/colors.c

@@ -291,19 +291,18 @@ void ffGenerateColorsJsonConfig(FFColorsOptions* options, yyjson_mut_doc* doc, y
     }
 }
 
+static FFModuleBaseInfo ffModuleInfo = {
+    .name = FF_COLORS_MODULE_NAME,
+    .description = "Print some colored blocks",
+    .parseCommandOptions = (void*) ffParseColorsCommandOptions,
+    .parseJsonObject = (void*) ffParseColorsJsonObject,
+    .printModule = (void*) ffPrintColors,
+    .generateJsonConfig = (void*) ffGenerateColorsJsonConfig,
+};
+
 void ffInitColorsOptions(FFColorsOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_COLORS_MODULE_NAME,
-        "Print some colored blocks",
-        ffParseColorsCommandOptions,
-        ffParseColorsJsonObject,
-        ffPrintColors,
-        NULL,
-        NULL,
-        ffGenerateColorsJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     ffStrbufSetStatic(&options->moduleArgs.key, " ");
     options->symbol = FF_COLORS_SYMBOL_BACKGROUND;

src/modules/command/command.c

@@ -4,8 +4,6 @@
 #include "modules/command/command.h"
 #include "util/stringUtils.h"
 
-#define FF_COMMAND_NUM_FORMAT_ARGS 1
-
 void ffPrintCommand(FFCommandOptions* options)
 {
     FF_STRBUF_AUTO_DESTROY result = ffStrbufCreate();
@@ -39,7 +37,7 @@ void ffPrintCommand(FFCommandOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_COMMAND_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        FF_PRINT_FORMAT_CHECKED(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
             FF_FORMAT_ARG(result, "result")
         }));
     }
@@ -154,26 +152,22 @@ void ffGenerateCommandJsonResult(FF_MAYBE_UNUSED FFCommandOptions* options, yyjs
     yyjson_mut_obj_add_strbuf(doc, module, "result", &result);
 }
 
-void ffPrintCommandHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_COMMAND_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_COMMAND_MODULE_NAME, "{1}", FF_COMMAND_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Run custom shell scripts",
-        "Command result - result"
+    .parseCommandOptions = (void*) ffParseCommandCommandOptions,
-    }));
+    .parseJsonObject = (void*) ffParseCommandJsonObject,
-}
+    .printModule = (void*) ffPrintCommand,
+    .generateJsonResult = (void*) ffGenerateCommandJsonResult,
+    .generateJsonConfig = (void*) ffGenerateCommandJsonConfig,
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Command result", "result"},
+    }))
+};
 
 void ffInitCommandOptions(FFCommandOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_COMMAND_MODULE_NAME,
-        "Running custom shell scripts",
-        ffParseCommandCommandOptions,
-        ffParseCommandJsonObject,
-        ffPrintCommand,
-        ffGenerateCommandJsonResult,
-        ffPrintCommandHelpFormat,
-        ffGenerateCommandJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 
     ffStrbufInitStatic(&options->shell,

src/modules/cpu/cpu.c

@@ -6,8 +6,6 @@
 #include "modules/cpu/cpu.h"
 #include "util/stringUtils.h"
 
-#define FF_CPU_NUM_FORMAT_ARGS 9
-
 static int sortCores(const FFCPUCore* a, const FFCPUCore* b)
 {
     return (int)b->freq - (int)a->freq;
@@ -55,6 +53,9 @@ void ffPrintCPU(FFCPUOptions* options)
 
             FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
 
+            if(cpu.packages > 1)
+                ffStrbufAppendF(&str, "%u x ", cpu.packages);
+
             if(cpu.name.length > 0)
                 ffStrbufAppend(&str, &cpu.name);
             else if(cpu.vendor.length > 0)
@@ -68,7 +69,12 @@ void ffPrintCPU(FFCPUOptions* options)
             if(coreTypes.length > 0)
                 ffStrbufAppendF(&str, " (%s)", coreTypes.chars);
             else if(cpu.coresOnline > 1)
-                ffStrbufAppendF(&str, " (%u)", cpu.coresOnline);
+            {
+                if(cpu.packages > 1)
+                    ffStrbufAppendF(&str, " (%u)", cpu.coresOnline / 2);
+                else
+                    ffStrbufAppendF(&str, " (%u)", cpu.coresOnline);
+            }
 
             uint32_t freq = cpu.frequencyMax;
             if(freq == 0)
@@ -96,7 +102,7 @@ void ffPrintCPU(FFCPUOptions* options)
 
             FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
             ffTempsAppendNum(cpu.temperature, &tempStr, options->tempConfig, &options->moduleArgs);
-            FF_PRINT_FORMAT_CHECKED(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPU_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            FF_PRINT_FORMAT_CHECKED(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
                 FF_FORMAT_ARG(cpu.name, "name"),
                 FF_FORMAT_ARG(cpu.vendor, "vendor"),
                 FF_FORMAT_ARG(cpu.coresPhysical, "cores-physical"),
@@ -106,6 +112,7 @@ void ffPrintCPU(FFCPUOptions* options)
                 FF_FORMAT_ARG(freqMax, "freq-max"),
                 FF_FORMAT_ARG(tempStr, "temperature"),
                 FF_FORMAT_ARG(coreTypes, "core-types"),
+                FF_FORMAT_ARG(cpu.packages, "packages"),
             }));
         }
     }
@@ -203,6 +210,10 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
         yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
         yyjson_mut_obj_add_strbuf(doc, obj, "cpu", &cpu.name);
         yyjson_mut_obj_add_strbuf(doc, obj, "vendor", &cpu.vendor);
+        if (cpu.packages == 0)
+            yyjson_mut_obj_add_null(doc, obj, "packages");
+        else
+            yyjson_mut_obj_add_uint(doc, obj, "packages", cpu.packages);
 
         yyjson_mut_val* cores = yyjson_mut_obj_add_obj(doc, obj, "cores");
         yyjson_mut_obj_add_uint(doc, cores, "physical", cpu.coresPhysical);
@@ -228,34 +239,31 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
     ffStrbufDestroy(&cpu.vendor);
 }
 
-void ffPrintCPUHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CPU_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CPU_MODULE_NAME, "{1} ({5}) @ {7} GHz", FF_CPU_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print CPU name, frequency, etc",
-        "Name - name",
+    .parseCommandOptions = (void*) ffParseCPUCommandOptions,
-        "Vendor - vendor",
+    .parseJsonObject = (void*) ffParseCPUJsonObject,
-        "Physical core count - cores-physical",
+    .printModule = (void*) ffPrintCPU,
-        "Logical core count - cores-logical",
+    .generateJsonResult = (void*) ffGenerateCPUJsonResult,
-        "Online core count - cores-online",
+    .generateJsonConfig = (void*) ffGenerateCPUJsonConfig,
-        "Base frequency (formatted) - freq-base",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Max frequency (formatted) - freq-max",
+        {"Name", "name"},
-        "Temperature (formatted) - temperature",
+        {"Vendor", "vendor"},
-        "Logical core count grouped by frequency - core-types",
+        {"Physical core count", "cores-physical"},
-    }));
+        {"Logical core count", "cores-logical"},
-}
+        {"Online core count", "cores-online"},
+        {"Base frequency (formatted)", "freq-base"},
+        {"Max frequency (formatted)", "freq-max"},
+        {"Temperature (formatted)", "temperature"},
+        {"Logical core count grouped by frequency", "core-types"},
+        {"Processor package count", "packages"},
+    }))
+};
 
 void ffInitCPUOptions(FFCPUOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CPU_MODULE_NAME,
-        "Print CPU name, frequency, etc",
-        ffParseCPUCommandOptions,
-        ffParseCPUJsonObject,
-        ffPrintCPU,
-        ffGenerateCPUJsonResult,
-        ffPrintCPUHelpFormat,
-        ffGenerateCPUJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     options->temp = false;
     options->tempConfig = (FFColorRangeConfig) { 60, 80 };

src/modules/cpucache/cpucache.c

@@ -5,7 +5,6 @@
 #include "util/stringUtils.h"
 
 #define FF_CPUCACHE_DISPLAY_NAME "CPU Cache"
-#define FF_CPUCACHE_NUM_FORMAT_ARGS 2
 
 static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOptions* options)
 {
@@ -22,7 +21,7 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption
         else
         {
             uint32_t index = i + 1;
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
                 FF_FORMAT_ARG(index, "index"),
                 FF_FORMAT_ARG(levelStr, "level"),
                 FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
@@ -61,7 +60,7 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption
         {
             FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate();
             ffParseSize(sum, &buffer2);
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_CPUCACHE_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
                 FF_FORMAT_ARG(buffer, "result"),
                 FF_FORMAT_ARG(buffer2, "sum"),
             }));
@@ -94,7 +93,7 @@ static void printCPUCacheCompact(const FFCPUCacheResult* result, FFCPUCacheOptio
     {
         FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate();
         ffParseSize(sum, &buffer2);
-        FF_PRINT_FORMAT_CHECKED(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPUCACHE_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(buffer, "result"),
             FF_FORMAT_ARG(buffer2, "sum"),
         }));
@@ -228,27 +227,23 @@ exit:
     ffListDestroy(&result.caches[3]);
 }
 
-void ffPrintCPUCacheHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CPUCACHE_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CPUCACHE_DISPLAY_NAME, "{1}", FF_CPUCACHE_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print CPU cache sizes",
-        "Separate result - result",
+    .parseCommandOptions = (void*) ffParseCPUCacheCommandOptions,
-        "Sum result - sum",
+    .parseJsonObject = (void*) ffParseCPUCacheJsonObject,
-    }));
+    .printModule = (void*) ffPrintCPUCache,
-}
+    .generateJsonResult = (void*) ffGenerateCPUCacheJsonResult,
+    .generateJsonConfig = (void*) ffGenerateCPUCacheJsonConfig,
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Separate result", "result"},
+        {"Sum result", "sum"},
+    }))
+};
 
 void ffInitCPUCacheOptions(FFCPUCacheOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CPUCACHE_MODULE_NAME,
-        "Print CPU cache sizes",
-        ffParseCPUCacheCommandOptions,
-        ffParseCPUCacheJsonObject,
-        ffPrintCPUCache,
-        ffGenerateCPUCacheJsonResult,
-        ffPrintCPUCacheHelpFormat,
-        ffGenerateCPUCacheJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 
     options->compact = false;

src/modules/cpuusage/cpuusage.c

@@ -6,7 +6,6 @@
 #include "util/stringUtils.h"
 
 #define FF_CPUUSAGE_DISPLAY_NAME "CPU Usage"
-#define FF_CPUUSAGE_NUM_FORMAT_ARGS 8
 
 void ffPrintCPUUsage(FFCPUUsageOptions* options)
 {
@@ -94,7 +93,7 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
         if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             ffPercentAppendBar(&maxBar, maxValue, options->percent, &options->moduleArgs);
 
-        FF_PRINT_FORMAT_CHECKED(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPUUSAGE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        FF_PRINT_FORMAT_CHECKED(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
             FF_FORMAT_ARG(avgNum, "avg"),
             FF_FORMAT_ARG(maxNum, "max"),
             FF_FORMAT_ARG(maxIndex, "max-index"),
@@ -194,33 +193,29 @@ void ffGenerateCPUUsageJsonResult(FFCPUUsageOptions* options, yyjson_mut_doc* do
     }
 }
 
-void ffPrintCPUUsageHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CPUUSAGE_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CPUUSAGE_MODULE_NAME, "{1}", FF_CPUUSAGE_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print CPU usage. Costs some time to collect data",
-        "CPU usage (percentage num, average) - avg",
+    .parseCommandOptions = (void*) ffParseCPUUsageCommandOptions,
-        "CPU usage (percentage num, maximum) - max",
+    .parseJsonObject = (void*) ffParseCPUUsageJsonObject,
-        "CPU core index of maximum usage - max-index",
+    .printModule = (void*) ffPrintCPUUsage,
-        "CPU usage (percentage num, minimum) - min",
+    .generateJsonResult = (void*) ffGenerateCPUUsageJsonResult,
-        "CPU core index of minimum usage - min-index",
+    .generateJsonConfig = (void*) ffGenerateCPUUsageJsonConfig,
-        "CPU usage (percentage bar, average) - avg-bar",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "CPU usage (percentage bar, maximum) - max-bar",
+        {"CPU usage (percentage num, average)", "avg"},
-        "CPU usage (percentage bar, minimum) - min-bar",
+        {"CPU usage (percentage num, maximum)", "max"},
-    }));
+        {"CPU core index of maximum usage", "max-index"},
-}
+        {"CPU usage (percentage num, minimum)", "min"},
+        {"CPU core index of minimum usage", "min-index"},
+        {"CPU usage (percentage bar, average)", "avg-bar"},
+        {"CPU usage (percentage bar, maximum)", "max-bar"},
+        {"CPU usage (percentage bar, minimum)", "min-bar"},
+    }))
+};
 
 void ffInitCPUUsageOptions(FFCPUUsageOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CPUUSAGE_MODULE_NAME,
-        "Print CPU usage. Costs some time to collect data",
-        ffParseCPUUsageCommandOptions,
-        ffParseCPUUsageJsonObject,
-        ffPrintCPUUsage,
-        ffGenerateCPUUsageJsonResult,
-        ffPrintCPUUsageHelpFormat,
-        ffGenerateCPUUsageJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰓅");
     options->separate = false;
     options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };

src/modules/cursor/cursor.c

@@ -4,8 +4,6 @@
 #include "modules/cursor/cursor.h"
 #include "util/stringUtils.h"
 
-#define FF_CURSOR_NUM_FORMAT_ARGS 2
-
 void ffPrintCursor(FFCursorOptions* options)
 {
     FFCursorResult result;
@@ -38,7 +36,7 @@ void ffPrintCursor(FFCursorOptions* options)
         }
         else
         {
-            FF_PRINT_FORMAT_CHECKED(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CURSOR_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                 FF_FORMAT_ARG(result.theme, "theme"),
                 FF_FORMAT_ARG(result.size, "size"),
             }));
@@ -110,27 +108,23 @@ void ffGenerateCursorJsonResult(FF_MAYBE_UNUSED FFCursorOptions* options, yyjson
     ffStrbufDestroy(&result.size);
 }
 
-void ffPrintCursorHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_CURSOR_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CURSOR_MODULE_NAME, "{1} ({2}px)", FF_CURSOR_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print cursor style name",
-        "Cursor theme - theme",
+    .parseCommandOptions = (void*) ffParseCursorCommandOptions,
-        "Cursor size - size"
+    .parseJsonObject = (void*) ffParseCursorJsonObject,
-    }));
+    .printModule = (void*) ffPrintCursor,
-}
+    .generateJsonResult = (void*) ffGenerateCursorJsonResult,
+    .generateJsonConfig = (void*) ffGenerateCursorJsonConfig,
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Cursor theme", "theme"},
+        {"Cursor size", "size"},
+    })),
+};
 
 void ffInitCursorOptions(FFCursorOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CURSOR_MODULE_NAME,
-        "Print cursor style name",
-        ffParseCursorCommandOptions,
-        ffParseCursorJsonObject,
-        ffPrintCursor,
-        ffGenerateCursorJsonResult,
-        ffPrintCursorHelpFormat,
-        ffGenerateCursorJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰆿");
 }
 

src/modules/custom/custom.c

@@ -44,19 +44,18 @@ void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module)
     }
 }
 
+static FFModuleBaseInfo ffModuleInfo = {
+    .name = FF_CUSTOM_MODULE_NAME,
+    .description = "Print a custom string, with or without key",
+    .parseCommandOptions = (void*) ffParseCustomCommandOptions,
+    .parseJsonObject = (void*) ffParseCustomJsonObject,
+    .printModule = (void*) ffPrintCustom,
+    .generateJsonConfig = (void*) ffGenerateCustomJsonConfig,
+};
+
 void ffInitCustomOptions(FFCustomOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_CUSTOM_MODULE_NAME,
-        "Print a custom string, with or without key",
-        ffParseCustomCommandOptions,
-        ffParseCustomJsonObject,
-        ffPrintCustom,
-        NULL,
-        NULL,
-        ffGenerateCustomJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
     ffStrbufSetStatic(&options->moduleArgs.key, " ");
 }

src/modules/datetime/datetime.c

@@ -9,7 +9,6 @@
 #pragma GCC diagnostic ignored "-Wformat" // warning: unknown conversion type character 'F' in format
 
 #define FF_DATETIME_DISPLAY_NAME "Date & Time"
-#define FF_DATETIME_NUM_FORMAT_ARGS 23
 
 typedef struct FFDateTimeResult
 {
@@ -67,7 +66,7 @@ void ffPrintDateTimeFormat(struct tm* tm, const FFModuleArgs* moduleArgs)
     strftime(result.offsetFromUtc, sizeof(result.offsetFromUtc), "%z", tm);
     strftime(result.timezoneName, sizeof(result.timezoneName), "%Z", tm);
 
-    FF_PRINT_FORMAT_CHECKED(FF_DATETIME_DISPLAY_NAME, 0, moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_DATETIME_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+    FF_PRINT_FORMAT_CHECKED(FF_DATETIME_DISPLAY_NAME, 0, moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
         FF_FORMAT_ARG(result.year, "year"), // 1
         FF_FORMAT_ARG(result.yearShort, "year-short"), // 2
         FF_FORMAT_ARG(result.month, "month"), // 3
@@ -158,48 +157,44 @@ void ffGenerateDateTimeJsonResult(FF_MAYBE_UNUSED FFDateTimeOptions* options, yy
     yyjson_mut_obj_add_strcpy(doc, module, "result", ffTimeToFullStr(ffTimeGetNow()));
 }
 
-void ffPrintDateTimeHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DATETIME_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DATETIME_MODULE_NAME, "{1}-{4}-{23} {14}:{18}:{20}", FF_DATETIME_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print current date and time",
-        "year - year",
+    .parseCommandOptions = (void*) ffParseDateTimeCommandOptions,
-        "last two digits of year - year-short",
+    .parseJsonObject = (void*) ffParseDateTimeJsonObject,
-        "month - month",
+    .printModule = (void*) ffPrintDateTime,
-        "month with leading zero - month-pretty",
+    .generateJsonResult = (void*) ffGenerateDateTimeJsonResult,
-        "month name - month-name",
+    .generateJsonConfig = (void*) ffGenerateDateTimeJsonConfig,
-        "month name short - month-name-short",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "week number on year - week",
+        {"Year", "year"},
-        "weekday - weekday",
+        {"Last two digits of year", "year-short"},
-        "weekday short - weekday-short",
+        {"Month", "month"},
-        "day in year - day-in-year",
+        {"Month with leading zero", "month-pretty"},
-        "day in month - day-in-month",
+        {"Month name", "month-name"},
-        "day in week - day-in-week",
+        {"Month name short", "month-name-short"},
-        "hour - hour",
+        {"Week number on year", "week"},
-        "hour with leading zero - hour-pretty",
+        {"Weekday", "weekday"},
-        "hour 12h format - hour-12",
+        {"Weekday short", "weekday-short"},
-        "hour 12h format with leading zero - hour-12-pretty",
+        {"Day in year", "day-in-year"},
-        "minute - minute",
+        {"Day in month", "day-in-month"},
-        "minute with leading zero - minute-pretty",
+        {"Day in week", "day-in-week"},
-        "second - second",
+        {"Hour", "hour"},
-        "second with leading zero - second-pretty",
+        {"Hour with leading zero", "hour-pretty"},
-        "offset from UTC in the ISO 8601 format - offset-from-utc",
+        {"Hour 12h format", "hour-12"},
-        "locale-dependent timezone name or abbreviation - timezone-name",
+        {"Hour 12h format with leading zero", "hour-12-pretty"},
-        "day in month with leading zero - day-pretty",
+        {"Minute", "minute"},
-    }));
+        {"Minute with leading zero", "minute-pretty"},
-}
+        {"Second", "second"},
+        {"Second with leading zero", "second-pretty"},
+        {"Offset from UTC in the ISO 8601 format", "offset-from-utc"},
+        {"Locale-dependent timezone name or abbreviation", "timezone-name"},
+        {"Day in month with leading zero", "day-pretty"},
+    }))
+};
 
 void ffInitDateTimeOptions(FFDateTimeOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DATETIME_MODULE_NAME,
-        "Print current date and time",
-        ffParseDateTimeCommandOptions,
-        ffParseDateTimeJsonObject,
-        ffPrintDateTime,
-        ffGenerateDateTimeJsonResult,
-        ffPrintDateTimeHelpFormat,
-        ffGenerateDateTimeJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/de/de.c

@@ -5,8 +5,6 @@
 #include "modules/de/de.h"
 #include "util/stringUtils.h"
 
-#define FF_DE_NUM_FORMAT_ARGS 3
-
 void ffPrintDE(FFDEOptions* options)
 {
     const FFDisplayServerResult* result = ffConnectDisplayServer();
@@ -36,7 +34,7 @@ void ffPrintDE(FFDEOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_DE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        FF_PRINT_FORMAT_CHECKED(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
             FF_FORMAT_ARG(result->deProcessName, "process-name"),
             FF_FORMAT_ARG(result->dePrettyName, "pretty-name"),
             FF_FORMAT_ARG(version, "version")
@@ -113,28 +111,24 @@ void ffGenerateDEJsonResult(FF_MAYBE_UNUSED FFDEOptions* options, yyjson_mut_doc
     yyjson_mut_obj_add_strbuf(doc, obj, "version", &version);
 }
 
-void ffPrintDEHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DE_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DE_MODULE_NAME, "{2} {3}", FF_DE_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print desktop environment name",
-        "DE process name - process-name",
+    .parseCommandOptions = (void*) ffParseDECommandOptions,
-        "DE pretty name - pretty-name",
+    .parseJsonObject = (void*) ffParseDEJsonObject,
-        "DE version - version"
+    .printModule = (void*) ffPrintDE,
-    }));
+    .generateJsonResult = (void*) ffGenerateDEJsonResult,
-}
+    .generateJsonConfig = (void*) ffGenerateDEJsonConfig,
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"DE process name", "process-name"},
+        {"DE pretty name", "pretty-name"},
+        {"DE version", "version"},
+    }))
+};
 
 void ffInitDEOptions(FFDEOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DE_MODULE_NAME,
-        "Print desktop environment name",
-        ffParseDECommandOptions,
-        ffParseDEJsonObject,
-        ffPrintDE,
-        ffGenerateDEJsonResult,
-        ffPrintDEHelpFormat,
-        ffGenerateDEJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 
     options->slowVersionDetection = false;

src/modules/disk/disk.c

@@ -7,7 +7,6 @@
 #include "modules/disk/disk.h"
 #include "util/stringUtils.h"
 
-#define FF_DISK_NUM_FORMAT_ARGS 14
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 
 static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index)
@@ -35,7 +34,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
     }
     else
     {
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 5, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
             FF_FORMAT_ARG(disk->mountpoint, "mountpoint"),
             FF_FORMAT_ARG(disk->name, "name"),
             FF_FORMAT_ARG(disk->mountFrom, "mount-from"),
@@ -126,7 +125,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
         bool isHidden = !!(disk->type & FF_DISK_VOLUME_TYPE_HIDDEN_BIT);
         bool isReadOnly = !!(disk->type & FF_DISK_VOLUME_TYPE_READONLY_BIT);
 
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISK_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
             FF_FORMAT_ARG(usedPretty, "size-used"),
             FF_FORMAT_ARG(totalPretty, "size-total"),
             FF_FORMAT_ARG(bytesPercentageNum, "size-percentage"),
@@ -440,39 +439,36 @@ void ffGenerateDiskJsonResult(FFDiskOptions* options, yyjson_mut_doc* doc, yyjso
     }
 }
 
-void ffPrintDiskHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DISK_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISK_MODULE_NAME, "{1} / {2} ({3}) - {9}", FF_DISK_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print partitions, space usage, file system, etc",
-        "Size used - size-used",
+    .parseCommandOptions = (void*) ffParseDiskCommandOptions,
-        "Size total - size-total",
+    .parseJsonObject = (void*) ffParseDiskJsonObject,
-        "Size percentage num - size-percentage",
+    .printModule = (void*) ffPrintDisk,
-        "Files used - files-used",
+    .generateJsonResult = (void*) ffGenerateDiskJsonResult,
-        "Files total - files-total",
+    .generateJsonConfig = (void*) ffGenerateDiskJsonConfig,
-        "Files percentage num - files-percentage",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "True if external volume - is-external",
+        {"Size used", "size-used"},
-        "True if hidden volume - is-hidden",
+        {"Size total", "size-total"},
-        "Filesystem - filesystem",
+        {"Size percentage num", "size-percentage"},
-        "Label / name - name",
+        {"Files used", "files-used"},
-        "True if read-only - is-readonly",
+        {"Files total", "files-total"},
-        "Create time in local timezone - create-time",
+        {"Files percentage num", "files-percentage"},
-        "Size percentage bar - size-percentage-bar",
+        {"True if external volume", "is-external"},
-        "Files percentage bar - files-percentage-bar",
+        {"True if hidden volume", "is-hidden"},
-    }));
+        {"Filesystem", "filesystem"},
-}
+        {"Label / name", "name"},
+        {"True if read-only", "is-readonly"},
+        {"Create time in local timezone", "create-time"},
+        {"Size percentage bar", "size-percentage-bar"},
+        {"Files percentage bar", "files-percentage-bar"},
+        {},
+    }))
+};
 
 void ffInitDiskOptions(FFDiskOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DISK_MODULE_NAME,
-        "Print partitions, space usage, file system, etc",
-        ffParseDiskCommandOptions,
-        ffParseDiskJsonObject,
-        ffPrintDisk,
-        ffGenerateDiskJsonResult,
-        ffPrintDiskHelpFormat,
-        ffGenerateDiskJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 
     ffStrbufInit(&options->folders);

src/modules/diskio/diskio.c

@@ -6,7 +6,6 @@
 #include "util/stringUtils.h"
 
 #define FF_DISKIO_DISPLAY_NAME "Disk IO"
-#define FF_DISKIO_NUM_FORMAT_ARGS 8
 
 static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right)
 {
@@ -22,7 +21,7 @@ static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint3
     else
     {
         ffStrbufClear(key);
-        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 4, ((FFformatarg[]){
+        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, ((FFformatarg[]){
             FF_FORMAT_ARG(index, "index"),
             FF_FORMAT_ARG(dev->name, "name"),
             FF_FORMAT_ARG(dev->devPath, "dev-path"),
@@ -75,7 +74,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
             ffParseSize(dev->bytesWritten, &buffer2);
             if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
 
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISKIO_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]){
                 FF_FORMAT_ARG(buffer, "size-read"),
                 FF_FORMAT_ARG(buffer2, "size-written"),
                 FF_FORMAT_ARG(dev->name, "name"),
@@ -203,33 +202,29 @@ void ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, y
     }
 }
 
-void ffPrintDiskIOHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DISKIO_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISKIO_MODULE_NAME, "{1} (R) - {2} (W)", FF_DISKIO_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print physical disk I/O throughput",
-        "Size of data read [per second] (formatted) - size-read",
+    .parseCommandOptions = (void*) ffParseDiskIOCommandOptions,
-        "Size of data written [per second] (formatted) - size-written",
+    .parseJsonObject = (void*) ffParseDiskIOJsonObject,
-        "Device name - name",
+    .printModule = (void*) ffPrintDiskIO,
-        "Device raw file path - dev-path",
+    .generateJsonResult = (void*) ffGenerateDiskIOJsonResult,
-        "Size of data read [per second] (in bytes) - bytes-read",
+    .generateJsonConfig = (void*) ffGenerateDiskIOJsonConfig,
-        "Size of data written [per second] (in bytes) - bytes-written",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Number of reads - read-count",
+        {"Size of data read [per second] (formatted)", "size-read"},
-        "Number of writes - write-count",
+        {"Size of data written [per second] (formatted)", "size-written"},
-    }));
+        {"Device name", "name"},
-}
+        {"Device raw file path", "dev-path"},
+        {"Size of data read [per second] (in bytes)", "bytes-read"},
+        {"Size of data written [per second] (in bytes)", "bytes-written"},
+        {"Number of reads", "read-count"},
+        {"Number of writes", "write-count"},
+    }))
+};
 
 void ffInitDiskIOOptions(FFDiskIOOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DISKIO_MODULE_NAME,
-        "Print physical disk I/O throughput",
-        ffParseDiskIOCommandOptions,
-        ffParseDiskIOJsonObject,
-        ffPrintDiskIO,
-        ffGenerateDiskIOJsonResult,
-        ffPrintDiskIOHelpFormat,
-        ffGenerateDiskIOJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰓅");
 
     ffStrbufInit(&options->namePrefix);

src/modules/display/display.c

@@ -6,8 +6,6 @@
 
 #include <math.h>
 
-#define FF_DISPLAY_NUM_FORMAT_ARGS 20
-
 static int sortByNameAsc(FFDisplayResult* a, FFDisplayResult* b)
 {
     return ffStrbufComp(&a->name, &b->name);
@@ -91,7 +89,7 @@ void ffPrintDisplay(FFDisplayOptions* options)
         }
         else
         {
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 4, ((FFformatarg[]){
+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
                 FF_FORMAT_ARG(moduleIndex, "index"),
                 FF_FORMAT_ARG(result->name, "name"),
                 FF_FORMAT_ARG(displayType, "type"),
@@ -148,7 +146,7 @@ void ffPrintDisplay(FFDisplayOptions* options)
         }
         else
         {
-            double ppi = sqrt(result->width * result->width + result->height * result->height) / inch;
+            double ppi = inch == 0 ? 0 : sqrt(result->width * result->width + result->height * result->height) / inch;
             bool hdrEnabled = result->hdrStatus == FF_DISPLAY_HDR_STATUS_ENABLED;
             bool hdrCompatible = result->hdrStatus == FF_DISPLAY_HDR_STATUS_SUPPORTED || result->hdrStatus == FF_DISPLAY_HDR_STATUS_ENABLED;
             uint32_t iInch = (uint32_t) (inch + 0.5), iPpi = (uint32_t) (ppi + 0.5);
@@ -164,6 +162,17 @@ void ffPrintDisplay(FFDisplayOptions* options)
             else
                 refreshRate[0] = 0;
 
+            char preferredRefreshRate[16];
+            if(result->preferredRefreshRate > 0)
+            {
+                if(options->preciseRefreshRate)
+                    snprintf(preferredRefreshRate, ARRAY_SIZE(preferredRefreshRate), "%g", ((int) (result->preferredRefreshRate * 1000 + 0.5)) / 1000.0);
+                else
+                    snprintf(preferredRefreshRate, ARRAY_SIZE(preferredRefreshRate), "%i", (uint32_t) (result->preferredRefreshRate + 0.5));
+            }
+            else
+                preferredRefreshRate[0] = 0;
+
             char buf[32];
             if (result->serial)
             {
@@ -173,7 +182,9 @@ void ffPrintDisplay(FFDisplayOptions* options)
             else
                 buf[0] = '\0';
 
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISPLAY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            double scaleFactor = (double) result->width / (double) result->scaledWidth;
+
+            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
                 FF_FORMAT_ARG(result->width, "width"),
                 FF_FORMAT_ARG(result->height, "height"),
                 FF_FORMAT_ARG(refreshRate, "refresh-rate"),
@@ -194,6 +205,10 @@ void ffPrintDisplay(FFDisplayOptions* options)
                 FF_FORMAT_ARG(buf, "serial"),
                 FF_FORMAT_ARG(result->platformApi, "platform-api"),
                 FF_FORMAT_ARG(hdrCompatible, "hdr-compatible"),
+                FF_FORMAT_ARG(scaleFactor, "scale-factor"),
+                FF_FORMAT_ARG(result->preferredWidth, "preferred-width"),
+                FF_FORMAT_ARG(result->preferredHeight, "preferred-height"),
+                FF_FORMAT_ARG(preferredRefreshRate, "preferred-refresh-rate"),
             }));
         }
     }
@@ -350,16 +365,21 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
         yyjson_mut_val* output = yyjson_mut_obj_add_obj(doc, obj, "output");
         yyjson_mut_obj_add_uint(doc, output, "width", item->width);
         yyjson_mut_obj_add_uint(doc, output, "height", item->height);
+        yyjson_mut_obj_add_real(doc, output, "refreshRate", item->refreshRate);
 
         yyjson_mut_val* scaled = yyjson_mut_obj_add_obj(doc, obj, "scaled");
         yyjson_mut_obj_add_uint(doc, scaled, "width", item->scaledWidth);
         yyjson_mut_obj_add_uint(doc, scaled, "height", item->scaledHeight);
 
+        yyjson_mut_val* preferred = yyjson_mut_obj_add_obj(doc, obj, "preferred");
+        yyjson_mut_obj_add_uint(doc, preferred, "width", item->preferredWidth);
+        yyjson_mut_obj_add_uint(doc, preferred, "height", item->preferredHeight);
+        yyjson_mut_obj_add_real(doc, preferred, "refreshRate", item->preferredRefreshRate);
+
         yyjson_mut_val* physical = yyjson_mut_obj_add_obj(doc, obj, "physical");
         yyjson_mut_obj_add_uint(doc, physical, "width", item->physicalWidth);
         yyjson_mut_obj_add_uint(doc, physical, "height", item->physicalHeight);
 
-        yyjson_mut_obj_add_real(doc, obj, "refreshRate", item->refreshRate);
         yyjson_mut_obj_add_uint(doc, obj, "rotation", item->rotation);
         yyjson_mut_obj_add_uint(doc, obj, "bitDepth", item->bitDepth);
         if (item->hdrStatus == FF_DISPLAY_HDR_STATUS_UNKNOWN)
@@ -413,45 +433,45 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
     }
 }
 
-void ffPrintDisplayHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DISPLAY_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISPLAY_MODULE_NAME, "{1}x{2} @ {3}Hz (as {4}x{5}) [{7}]", FF_DISPLAY_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print resolutions, refresh rates, etc",
-        "Screen width (in pixels) - width",
+    .parseCommandOptions = (void*) ffParseDisplayCommandOptions,
-        "Screen height (in pixels) - height",
+    .parseJsonObject = (void*) ffParseDisplayJsonObject,
-        "Screen refresh rate (in Hz) - refresh-rate",
+    .printModule = (void*) ffPrintDisplay,
-        "Screen scaled width (in pixels) - scaled-width",
+    .generateJsonResult = (void*) ffGenerateDisplayJsonResult,
-        "Screen scaled height (in pixels) - scaled-height",
+    .generateJsonConfig = (void*) ffGenerateDisplayJsonConfig,
-        "Screen name - name",
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-        "Screen type (builtin, external or unknown) - type",
+        {"Screen configured width (in pixels)", "width"},
-        "Screen rotation (in degrees) - rotation",
+        {"Screen configured height (in pixels)", "height"},
-        "True if being the primary screen - is-primary",
+        {"Screen configured refresh rate (in Hz)", "refresh-rate"},
-        "Screen physical width (in millimeters) - physical-width",
+        {"Screen scaled width (in pixels)", "scaled-width"},
-        "Screen physical height (in millimeters) - physical-height",
+        {"Screen scaled height (in pixels)", "scaled-height"},
-        "Physical diagonal length in inches - inch",
+        {"Screen name", "name"},
-        "Pixels per inch (PPI) - ppi",
+        {"Screen type (builtin, external or unknown)", "type"},
-        "Bits per color channel - bit-depth",
+        {"Screen rotation (in degrees)", "rotation"},
-        "True if high dynamic range (HDR) mode is enabled - hdr-enabled",
+        {"True if being the primary screen", "is-primary"},
-        "Year of manufacturing - manufacture-year",
+        {"Screen physical width (in millimeters)", "physical-width"},
-        "Nth week of manufacturing in the year - manufacture-week",
+        {"Screen physical height (in millimeters)", "physical-height"},
-        "Serial number - serial",
+        {"Physical diagonal length in inches", "inch"},
-        "The platform API used when detecting the display - platform-api",
+        {"Pixels per inch (PPI)", "ppi"},
-        "True if the display is HDR compatible - hdr-compatible",
+        {"Bits per color channel", "bit-depth"},
-    }));
+        {"True if high dynamic range (HDR) mode is enabled", "hdr-enabled"},
-}
+        {"Year of manufacturing", "manufacture-year"},
+        {"Nth week of manufacturing in the year", "manufacture-week"},
+        {"Serial number", "serial"},
+        {"The platform API used when detecting the display", "platform-api"},
+        {"True if the display is HDR compatible", "hdr-compatible"},
+        {"HiDPI scale factor", "scale-factor"},
+        {"Screen preferred width (in pixels)", "preferred-width"},
+        {"Screen preferred height (in pixels)", "preferred-height"},
+        {"Screen preferred refresh rate (in Hz)", "preferred-refresh-rate"},
+    }))
+};
 
 void ffInitDisplayOptions(FFDisplayOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DISPLAY_MODULE_NAME,
-        "Print resolutions, refresh rates, etc",
-        ffParseDisplayCommandOptions,
-        ffParseDisplayJsonObject,
-        ffPrintDisplay,
-        ffGenerateDisplayJsonResult,
-        ffPrintDisplayHelpFormat,
-        ffGenerateDisplayJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰍹");
     options->compactType = FF_DISPLAY_COMPACT_TYPE_NONE;
     options->preciseRefreshRate = false;

src/modules/dns/dns.c

@@ -4,8 +4,6 @@
 #include "modules/dns/dns.h"
 #include "util/stringUtils.h"
 
-#define FF_DNS_NUM_FORMAT_ARGS 1
-
 void ffPrintDNS(FFDNSOptions* options)
 {
     FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFstrbuf));
@@ -48,7 +46,7 @@ void ffPrintDNS(FFDNSOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_DNS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(buf, "result"),
         }));
     }
@@ -166,26 +164,22 @@ exit:
     }
 }
 
-void ffPrintDNSHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_DNS_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DNS_MODULE_NAME, "{1}", FF_DNS_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print configured DNS servers",
-        "DNS result - result",
+    .parseCommandOptions = (void*) ffParseDNSCommandOptions,
-    }));
+    .parseJsonObject = (void*) ffParseDNSJsonObject,
-}
+    .printModule = (void*) ffPrintDNS,
+    .generateJsonResult = (void*) ffGenerateDNSJsonResult,
+    .generateJsonConfig = (void*) ffGenerateDNSJsonConfig,
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"DNS result", "result"},
+    }))
+};
 
 void ffInitDNSOptions(FFDNSOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_DNS_MODULE_NAME,
-        "Print configured DNS servers",
-        ffParseDNSCommandOptions,
-        ffParseDNSJsonObject,
-        ffPrintDNS,
-        ffGenerateDNSJsonResult,
-        ffPrintDNSHelpFormat,
-        ffGenerateDNSJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰇖");
 
     options->showType = FF_DNS_TYPE_BOTH;

src/modules/editor/editor.c

@@ -5,8 +5,6 @@
 #include "modules/editor/editor.h"
 #include "util/stringUtils.h"
 
-#define FF_EDITOR_NUM_FORMAT_ARGS 5
-
 void ffPrintEditor(FFEditorOptions* options)
 {
     FFEditorResult result = {
@@ -41,7 +39,7 @@ void ffPrintEditor(FFEditorOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_EDITOR_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        FF_PRINT_FORMAT_CHECKED(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
             FF_FORMAT_ARG(result.type, "type"),
             FF_FORMAT_ARG(result.name, "name"),
             FF_FORMAT_ARG(result.exe, "exe-name"),
@@ -120,30 +118,26 @@ void ffGenerateEditorJsonResult(FF_MAYBE_UNUSED FFEditorOptions* options, yyjson
     ffStrbufDestroy(&result.version);
 }
 
-void ffPrintEditorHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_EDITOR_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_EDITOR_MODULE_NAME, "{2} ({4})", FF_EDITOR_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print information of the default editor ($VISUAL or $EDITOR)",
-        "Type (Visual / Editor) - type",
+    .parseCommandOptions = (void*) ffParseEditorCommandOptions,
-        "Name - name",
+    .parseJsonObject = (void*) ffParseEditorJsonObject,
-        "Exe name of real path - exe-name",
+    .printModule = (void*) ffPrintEditor,
-        "Full path of real path - full-path",
+    .generateJsonResult = (void*) ffGenerateEditorJsonResult,
-        "Version - version",
+    .generateJsonConfig = (void*) ffGenerateEditorJsonConfig,
-    }));
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-}
+        {"Type (Visual / Editor)", "type"},
+        {"Name", "name"},
+        {"Exe name of real path", "exe-name"},
+        {"Full path of real path", "full-path"},
+        {"Version", "version"},
+    }))
+};
 
 void ffInitEditorOptions(FFEditorOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_EDITOR_MODULE_NAME,
-        "Print information of the default editor ($VISUAL or $EDITOR)",
-        ffParseEditorCommandOptions,
-        ffParseEditorJsonObject,
-        ffPrintEditor,
-        ffGenerateEditorJsonResult,
-        ffPrintEditorHelpFormat,
-        ffGenerateEditorJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󱞎");
 }
 

src/modules/font/font.c

@@ -4,8 +4,6 @@
 #include "modules/font/font.h"
 #include "util/stringUtils.h"
 
-#define FF_FONT_NUM_FORMAT_ARGS (FF_DETECT_FONT_NUM_FONTS + 1)
-
 void ffPrintFont(FFFontOptions* options)
 {
     FFFontResult font;
@@ -28,7 +26,7 @@ void ffPrintFont(FFFontOptions* options)
         }
         else
         {
-            FF_PRINT_FORMAT_CHECKED(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_FONT_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                 FF_FORMAT_ARG(font.fonts[0], "font1"),
                 FF_FORMAT_ARG(font.fonts[1], "font2"),
                 FF_FORMAT_ARG(font.fonts[2], "font3"),
@@ -104,30 +102,26 @@ void ffGenerateFontJsonResult(FF_MAYBE_UNUSED FFFontOptions* options, yyjson_mut
         ffStrbufDestroy(&font.fonts[i]);
 }
 
-void ffPrintFontHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_FONT_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_FONT_MODULE_NAME, "{5}", FF_FONT_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "Print system font names",
-        "Font 1 - font1",
+    .parseCommandOptions = (void*) ffParseFontCommandOptions,
-        "Font 2 - font2",
+    .parseJsonObject = (void*) ffParseFontJsonObject,
-        "Font 3 - font3",
+    .printModule = (void*) ffPrintFont,
-        "Font 4 - font4",
+    .generateJsonResult = (void*) ffGenerateFontJsonResult,
-        "Combined fonts for display - combined"
+    .generateJsonConfig = (void*) ffGenerateFontJsonConfig,
-    }));
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
-}
+        {"Font 1", "font1"},
+        {"Font 2", "font2"},
+        {"Font 3", "font3"},
+        {"Font 4", "font4"},
+        {"Combined fonts for display", "combined"},
+    }))
+};
 
 void ffInitFontOptions(FFFontOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_FONT_MODULE_NAME,
-        "Print system font name",
-        ffParseFontCommandOptions,
-        ffParseFontJsonObject,
-        ffPrintFont,
-        ffGenerateFontJsonResult,
-        ffPrintFontHelpFormat,
-        ffGenerateFontJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "");
 }
 

src/modules/gamepad/gamepad.c

@@ -5,8 +5,6 @@
 #include "modules/gamepad/gamepad.h"
 #include "util/stringUtils.h"
 
-#define FF_GAMEPAD_NUM_FORMAT_ARGS 4
-
 static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index)
 {
     FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
@@ -43,7 +41,7 @@ static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device
         if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
             ffPercentAppendBar(&percentageBar, device->battery, options->percent, &options->moduleArgs);
 
-        FF_PRINT_FORMAT_CHECKED(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_GAMEPAD_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
             FF_FORMAT_ARG(device->name, "name"),
             FF_FORMAT_ARG(device->serial, "serial"),
             FF_FORMAT_ARG(percentageNum, "battery-percentage"),
@@ -149,29 +147,25 @@ void ffGenerateGamepadJsonResult(FF_MAYBE_UNUSED FFGamepadOptions* options, yyjs
     }
 }
 
-void ffPrintGamepadHelpFormat(void)
+static FFModuleBaseInfo ffModuleInfo = {
-{
+    .name = FF_GAMEPAD_MODULE_NAME,
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_GAMEPAD_MODULE_NAME, "{1} ({3})", FF_GAMEPAD_NUM_FORMAT_ARGS, ((const char* []) {
+    .description = "List (connected) gamepads",
-        "Name - name",
+    .parseCommandOptions = (void*) ffParseGamepadCommandOptions,
-        "Serial number - serial",
+    .parseJsonObject = (void*) ffParseGamepadJsonObject,
-        "Battery percentage num - battery-percentage",
+    .printModule = (void*) ffPrintGamepad,
-        "Battery percentage bar - battery-percentage-bar",
+    .generateJsonResult = (void*) ffGenerateGamepadJsonResult,
-    }));
+    .generateJsonConfig = (void*) ffGenerateGamepadJsonConfig,
-}
+    .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
+        {"Name", "name"},
+        {"Serial number", "serial"},
+        {"Battery percentage num", "battery-percentage"},
+        {"Battery percentage bar", "battery-percentage-bar"},
+    }))
+};
 
 void ffInitGamepadOptions(FFGamepadOptions* options)
 {
-    ffOptionInitModuleBaseInfo(
+    options->moduleInfo = ffModuleInfo;
-        &options->moduleInfo,
-        FF_GAMEPAD_MODULE_NAME,
-        "List connected gamepads",
-        ffParseGamepadCommandOptions,
-        ffParseGamepadJsonObject,
-        ffPrintGamepad,
-        ffGenerateGamepadJsonResult,
-        ffPrintGamepadHelpFormat,
-        ffGenerateGamepadJsonConfig
-    );
     ffOptionInitModuleArg(&options->moduleArgs, "󰺵");
     options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
 }