Vulkan: add JSON config support

src/modules/jsonconfig/jsonconfig.c

@@ -139,6 +139,12 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
                 false;
         }
 
+        case 'V': {
+            return
+                tryModule(instance, type, module, FF_VULKAN_MODULE_NAME, ffParseVulkanJsonObject) ||
+                false;
+        }
+
         case 'W': {
             return
                 tryModule(instance, type, module, FF_WALLPAPER_MODULE_NAME, ffParseWallpaperJsonObject) ||

src/modules/modules.h

@@ -41,6 +41,7 @@
 #include "modules/title/title.h"
 #include "modules/jsonconfig/jsonconfig.h"
 #include "modules/uptime/uptime.h"
+#include "modules/vulkan/vulkan.h"
 #include "modules/wallpaper/wallpaper.h"
 #include "modules/wifi/wifi.h"
 #include "modules/wm/wm.h"

src/modules/options.h

@@ -38,6 +38,7 @@
 #include "modules/terminalfont/option.h"
 #include "modules/title/option.h"
 #include "modules/uptime/option.h"
+#include "modules/vulkan/option.h"
 #include "modules/wallpaper/option.h"
 #include "modules/wifi/option.h"
 #include "modules/wm/option.h"

src/modules/vulkan.c

@@ -1,43 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/vulkan/vulkan.h"
-
-#define FF_VULKAN_MODULE_NAME "Vulkan"
-#define FF_VULKAN_NUM_FORMAT_ARGS 3
-
-void ffPrintVulkan(FFinstance* instance)
-{
-    const FFVulkanResult* vulkan = ffDetectVulkan(instance);
-
-    if(vulkan->error)
-    {
-        ffPrintError(instance, FF_VULKAN_MODULE_NAME, 0, &instance->config.vulkan, "%s", vulkan->error);
-        return;
-    }
-
-    if(instance->config.vulkan.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_VULKAN_MODULE_NAME, 0, &instance->config.vulkan.key);
-
-        if(vulkan->apiVersion.length > 0)
-        {
-            ffStrbufWriteTo(&vulkan->apiVersion, stdout);
-
-            if(vulkan->driver.length > 0)
-                fputs(" - ", stdout);
-        }
-
-        if(vulkan->driver.length > 0)
-            ffStrbufWriteTo(&vulkan->driver, stdout);
-
-        putchar('\n');
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_VULKAN_MODULE_NAME, 0, &instance->config.vulkan, FF_VULKAN_NUM_FORMAT_ARGS, (FFformatarg[]) {
-            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->driver},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->apiVersion},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->conformanceVersion}
-        });
-    }
-}

src/modules/vulkan/option.h

@@ -0,0 +1,11 @@
+#pragma once
+
+// This file will be included in "fastfetch.h", do NOT put unnecessary things here
+
+#include "common/option.h"
+
+typedef struct FFVulkanOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+} FFVulkanOptions;

src/modules/vulkan/vulkan.c

@@ -0,0 +1,85 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/vulkan/vulkan.h"
+#include "modules/vulkan/vulkan.h"
+
+#define FF_VULKAN_NUM_FORMAT_ARGS 3
+
+void ffPrintVulkan(FFinstance* instance, FFVulkanOptions* options)
+{
+    const FFVulkanResult* vulkan = ffDetectVulkan(instance);
+
+    if(vulkan->error)
+    {
+        ffPrintError(instance, FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, "%s", vulkan->error);
+        return;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        if(vulkan->apiVersion.length > 0)
+        {
+            ffStrbufWriteTo(&vulkan->apiVersion, stdout);
+
+            if(vulkan->driver.length > 0)
+                fputs(" - ", stdout);
+        }
+
+        if(vulkan->driver.length > 0)
+            ffStrbufWriteTo(&vulkan->driver, stdout);
+
+        putchar('\n');
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_VULKAN_NUM_FORMAT_ARGS, (FFformatarg[]) {
+            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->driver},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->apiVersion},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &vulkan->conformanceVersion}
+        });
+    }
+}
+
+void ffInitVulkanOptions(FFVulkanOptions* options)
+{
+    options->moduleName = FF_VULKAN_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_VULKAN_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyVulkanOptions(FFVulkanOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseVulkanJsonObject(FFinstance* instance, json_object* module)
+{
+    FFVulkanOptions __attribute__((__cleanup__(ffDestroyVulkanOptions))) options;
+    ffInitVulkanOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_VULKAN_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintVulkan(instance, &options);
+}
+#endif

src/modules/vulkan/vulkan.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_VULKAN_MODULE_NAME "Vulkan"
+
+void ffPrintVulkan(FFinstance* instance, FFVulkanOptions* options);
+void ffInitVulkanOptions(FFVulkanOptions* options);
+bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, const char* value);
+void ffDestroyVulkanOptions(FFVulkanOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseVulkanJsonObject(FFinstance* instance, json_object* module);
+#endif