Cursor: support JSON config

src/modules/cursor.c

@@ -1,55 +0,0 @@
-#include "fastfetch.h"
-
-#include "common/printing.h"
-#include "detection/cursor/cursor.h"
-
-#define FF_CURSOR_MODULE_NAME "Cursor"
-#define FF_CURSOR_NUM_FORMAT_ARGS 2
-
-static void printCursor(FFinstance* instance, FFCursorResult* cursor)
-{
-    ffStrbufRemoveIgnCaseEndS(&cursor->theme, "cursors");
-    ffStrbufRemoveIgnCaseEndS(&cursor->theme, "cursor");
-    ffStrbufTrimRight(&cursor->theme, '_');
-    ffStrbufTrimRight(&cursor->theme, '-');
-    if(cursor->theme.length == 0)
-        ffStrbufAppendS(&cursor->theme, "default");
-
-    if(instance->config.cursor.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursor.key);
-        ffStrbufWriteTo(&cursor->theme, stdout);
-
-        if(cursor->size.length > 0)
-            printf(" (%spx)", cursor->size.chars);
-
-        putchar('\n');
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursor, FF_CURSOR_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, &cursor->theme},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &cursor->size}
-        });
-    }
-}
-
-
-void ffPrintCursor(FFinstance* instance)
-{
-    FFCursorResult result;
-    ffStrbufInit(&result.error);
-    ffStrbufInit(&result.theme);
-    ffStrbufInit(&result.size);
-
-    ffDetectCursor(instance, &result);
-
-    if(result.error.length)
-        ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursor, "%s", result.error.chars);
-    else
-        printCursor(instance, &result);
-
-    ffStrbufDestroy(&result.error);
-    ffStrbufDestroy(&result.theme);
-    ffStrbufDestroy(&result.size);
-}

src/modules/cursor/cursor.c

@@ -0,0 +1,93 @@
+#include "fastfetch.h"
+
+#include "common/printing.h"
+#include "detection/cursor/cursor.h"
+#include "modules/cursor/cursor.h"
+
+#define FF_CURSOR_NUM_FORMAT_ARGS 2
+
+void ffPrintCursor(FFinstance* instance, FFCursorOptions* options)
+{
+    FFCursorResult result;
+    ffStrbufInit(&result.error);
+    ffStrbufInit(&result.theme);
+    ffStrbufInit(&result.size);
+
+    ffDetectCursor(instance, &result);
+
+    if(result.error.length)
+        ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, "%s", result.error.chars);
+    else
+    {
+        ffStrbufRemoveIgnCaseEndS(&result.theme, "cursors");
+        ffStrbufRemoveIgnCaseEndS(&result.theme, "cursor");
+        ffStrbufTrimRight(&result.theme, '_');
+        ffStrbufTrimRight(&result.theme, '-');
+        if(result.theme.length == 0)
+            ffStrbufAppendS(&result.theme, "default");
+
+        if(options->moduleArgs.outputFormat.length == 0)
+        {
+            ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs.key);
+            ffStrbufWriteTo(&result.theme, stdout);
+
+            if(result.size.length > 0)
+                printf(" (%spx)", result.size.chars);
+
+            putchar('\n');
+        }
+        else
+        {
+            ffPrintFormat(instance, FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_CURSOR_NUM_FORMAT_ARGS, (FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_STRBUF, &result.theme},
+                {FF_FORMAT_ARG_TYPE_STRBUF, &result.size}
+            });
+        }
+    }
+
+    ffStrbufDestroy(&result.error);
+    ffStrbufDestroy(&result.theme);
+    ffStrbufDestroy(&result.size);
+}
+
+void ffInitCursorOptions(FFCursorOptions* options)
+{
+    options->moduleName = FF_CURSOR_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_CURSOR_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyCursorOptions(FFCursorOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseCursorJsonObject(FFinstance* instance, json_object* module)
+{
+    FFCursorOptions __attribute__((__cleanup__(ffDestroyCursorOptions))) options;
+    ffInitCursorOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintCursor(instance, &options);
+}
+#endif

src/modules/cursor/cursor.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_CURSOR_MODULE_NAME "Cursor"
+
+void ffPrintCursor(FFinstance* instance, FFCursorOptions* options);
+void ffInitCursorOptions(FFCursorOptions* options);
+bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, const char* value);
+void ffDestroyCursorOptions(FFCursorOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseCursorJsonObject(FFinstance* instance, json_object* module);
+#endif

src/modules/cursor/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 FFCursorOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+} FFCursorOptions;

src/modules/jsonconfig/jsonconfig.c

@@ -43,6 +43,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
                 tryModule(instance, type, module, FF_CPUUSAGE_MODULE_NAME, ffParseCPUUsageJsonObject) ||
                 tryModule(instance, type, module, FF_COMMAND_MODULE_NAME, ffParseCommandJsonObject) ||
                 tryModule(instance, type, module, FF_COLORS_MODULE_NAME, ffParseColorsJsonObject) ||
+                tryModule(instance, type, module, FF_CURSOR_MODULE_NAME, ffParseCursorJsonObject) ||
                 false;
         }
 

src/modules/modules.h

@@ -13,6 +13,7 @@
 #include "modules/cpuusage/cpuusage.h"
 #include "modules/command/command.h"
 #include "modules/colors/colors.h"
+#include "modules/cursor/cursor.h"
 #include "modules/datetime/datetime.h"
 #include "modules/display/display.h"
 #include "modules/host/host.h"

src/modules/options.h

@@ -9,6 +9,7 @@
 #include "modules/brightness/option.h"
 #include "modules/cpu/option.h"
 #include "modules/cpuusage/option.h"
+#include "modules/cursor/option.h"
 #include "modules/command/option.h"
 #include "modules/datetime/option.h"
 #include "modules/display/option.h"