Refactor font output

Author: LinusDierheimer

CMakeLists.txt

@@ -200,6 +200,7 @@ set(LIBFASTFETCH_SRC
     src/detection/cpu/cpu.c
     src/detection/gpu/gpu.c
     src/detection/memory/memory.c
+    src/detection/font/font.c
     src/detection/displayserver/displayserver.c
     src/detection/terminalfont/terminalfont.c
     src/detection/media/media.c

completions/bash

@@ -180,7 +180,6 @@ __fastfetch_completion()
         "--cpu-temp"
         "--gpu-temp"
         "--battery-temp"
-        "--font-inline"
         "--localip-show-ipv4"
         "--localip-show-ipv6"
         "--localip-show-loop"

presets/examples/5

@@ -8,5 +8,4 @@
 --icons-key I
 --icons-format {5}
 --font-key F
---font-format {21}
 --cursor-key C

presets/verbose

@@ -11,7 +11,7 @@
 --wm-theme-format Name: {}
 --theme-format Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
 --icons-format Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
---font-format Type: {}; Font: {}
+--font-format Font1: {}; Font2: {}; Font3: {}; Font4: {}
 --cursor-format Theme: {}; Size: {}
 --terminal-format Process: {}; Path: {}; Exe: {}
 --terminal-font-format Pretty: {}; Name: {}; Size: {}; Styles: {}

src/common/init.c

@@ -236,8 +236,6 @@ static void defaultConfig(FFinstance* instance)
 
     ffStrbufInitA(&instance->config.separatorString, 0);
 
-    instance->config.fontInline = true;
-
     instance->config.localIpShowIpV4 = true;
     instance->config.localIpShowIpV6 = false;
     instance->config.localIpShowLoop = false;

src/data/help.txt

@@ -97,7 +97,6 @@ Module specific options:
     --cpu-temp  <?value>:         Detect and display CPU temperature if supported. Default is false
     --gpu-temp  <?value>:         Detect and display GPU temperature if supported. Default is false
     --battery-temp  <?value>:     Detect and display Battery temperature if supported. Default is false
-    --font-inline <?value>:       Display fonts of different DE in one line
     --localip-show-ipv4 <?value>: Show ipv4 addresses in local ip module. Default is true
     --localip-show-ipv6 <?value>: Show ipv6 addresses in local ip module. Default is false
     --localip-show-loop <?value>: Show loop back addresses (127.0.0.1) in local ip module. Default is false

src/detection/font/font.c

@@ -0,0 +1,32 @@
+#include "font.h"
+#include "detection/internal.h"
+
+void ffDetectFontImpl(const FFinstance* instance, FFFontResult* font);
+
+static void detectFont(const FFinstance* instance, FFFontResult* font)
+{
+    ffStrbufInit(&font->error);
+
+    for(uint32_t i = 0; i < FF_DETECT_FONT_NUM_FONTS; ++i)
+        ffStrbufInit(&font->fonts[i]);
+
+    ffDetectFontImpl(instance, font);
+
+    if(font->error.length > 0)
+        return;
+
+    for(uint32_t i = 0; i < FF_DETECT_FONT_NUM_FONTS; ++i)
+    {
+        if(font->fonts[i].length > 0)
+            return;
+    }
+
+    ffStrbufAppendS(&font->error, "No fonts found");
+}
+
+const FFFontResult* ffDetectFont(const FFinstance* instance)
+{
+    FF_DETECTION_INTERNAL_GUARD(FFFontResult,
+        detectFont(instance, &result);
+    );
+}

src/detection/font/font.h

@@ -4,15 +4,21 @@
 #define FF_INCLUDED_detection_font_font
 
 #include "fastfetch.h"
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+
+#define FF_DETECT_FONT_NUM_FONTS 4
 
 typedef struct FFFontResult
 {
-    const char* type;
-    FFstrbuf fontPretty;
+    FFstrbuf error;
+
+    /**
+     * Linux / BSD: QT,     GTK2,  GTK3,  GTK4
+     * MacOS:       System, User,  Unset, Unset
+     * Other:       Unset,  Unset, Unset, Unset
+     */
+    FFstrbuf fonts[FF_DETECT_FONT_NUM_FONTS];
 } FFFontResult;
 
-const char* ffDetectFontImpl(FFinstance* instance, FFlist* result);
+const FFFontResult* ffDetectFont(const FFinstance* instance);
 
 #endif

src/detection/font/font_android.c

@@ -1,8 +1,7 @@
 #include "fastfetch.h"
-#include "common/font.h"
 
-const char* ffDetectFontImpl(FFinstance* instance, FFlist* result)
+void ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)
 {
-    FF_UNUSED(instance, result);
-    return "Font detection is not supported on Android";
+    FF_UNUSED(instance);
+    ffStrbufAppendS(&result->error, "Not implemented");
 }

src/detection/font/font_apple.m

@@ -4,38 +4,27 @@
 
 #import <AppKit/AppKit.h>
 
-#define FF_FONT_MODULE_NAME "Font"
-
-static void detectFontForType(CTFontUIFontType uiType, FFFontResult* result)
+static void detectFontForType(CTFontUIFontType uiType, FFstrbuf* font)
 {
     CTFontRef ctFont = CTFontCreateUIFontForLanguage(uiType, 12, NULL);
+    ffCfStrGetString(CTFontCopyFullName(ctFont), font);
 
-    ffStrbufInit(&result->fontPretty);
-    ffCfStrGetString(CTFontCopyFullName(ctFont), &result->fontPretty);
+    if(font->length == 0)
+        return;
 
     FFstrbuf familyName;
     ffStrbufInit(&familyName);
     ffCfStrGetString(CTFontCopyFamilyName(ctFont), &familyName);
 
-    if (ffStrbufComp(&familyName, &result->fontPretty) != 0)
-    {
-        ffStrbufAppendF(&result->fontPretty, " (%*s)", familyName.length, familyName.chars);
-    }
+    if (ffStrbufComp(&familyName, font) != 0)
+        ffStrbufAppendF(font, " (%*s)", familyName.length, familyName.chars);
 
     ffStrbufDestroy(&familyName);
 }
 
-const char* ffDetectFontImpl(FFinstance* instance, FFlist* result)
+void ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)
 {
     FF_UNUSED(instance);
-
-    FFFontResult* resultSystem = (FFFontResult*)ffListAdd(result);
-    resultSystem->type = "SYS";
-    detectFontForType(kCTFontUIFontSystem, resultSystem);
-
-    FFFontResult* resultUser = (FFFontResult*)ffListAdd(result);
-    resultUser->type = "USER";
-    detectFontForType(kCTFontUIFontUser, resultUser);
-
-    return NULL;
+    detectFontForType(kCTFontUIFontSystem, &result->fonts[0]);
+    detectFontForType(kCTFontUIFontUser, &result->fonts[1]);
 }