Refactor: move wm/de detection to own header

src/common/init.c

@@ -2,6 +2,7 @@
 #include "common/caching.h"
 #include "detection/qt.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/detection/displayserver.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_displayserver
+#define FF_INCLUDED_detection_displayserver
+
+typedef struct FFResolutionResult
+{
+    uint32_t width;
+    uint32_t height;
+    uint32_t refreshRate;
+} FFResolutionResult;
+
+typedef struct FFDisplayServerResult
+{
+    FFstrbuf wmProcessName;
+    FFstrbuf wmPrettyName;
+    FFstrbuf wmProtocolName;
+    FFstrbuf deProcessName;
+    FFstrbuf dePrettyName;
+    FFstrbuf deVersion;
+    FFlist resolutions; //List of FFResolutionResult
+} FFDisplayServerResult;
+
+const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance);
+
+#endif
+

src/detection/displayserver/displayServer.h

@@ -4,6 +4,7 @@
 #define FASTFETCH_INCLUDED_DISPLAYSERVER
 
 #include "fastfetch.h"
+#include "detection/displayserver.h"
 
 #define FF_DISPLAYSERVER_PROTOCOL_WAYLAND "Wayland"
 #define FF_DISPLAYSERVER_PROTOCOL_X11 "X11"

src/detection/gtk.c

@@ -2,6 +2,7 @@
 #include "detection/gtk.h"
 #include "common/properties.h"
 #include "common/settings.h"
+#include "detection/displayserver.h"
 
 #include <pthread.h>
 

src/detection/qt.c

@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "detection/qt.h"
 #include "common/properties.h"
+#include "detection/displayserver.h"
 
 #include <stdlib.h>
 #include <string.h>

src/fastfetch.h

@@ -205,24 +205,6 @@ typedef struct FFVulkanResult
     FFlist devices; //List of FFGPUResult
 } FFVulkanResult;
 
-typedef struct FFResolutionResult
-{
-    uint32_t width;
-    uint32_t height;
-    uint32_t refreshRate;
-} FFResolutionResult;
-
-typedef struct FFDisplayServerResult
-{
-    FFstrbuf wmProcessName;
-    FFstrbuf wmPrettyName;
-    FFstrbuf wmProtocolName;
-    FFstrbuf deProcessName;
-    FFstrbuf dePrettyName;
-    FFstrbuf deVersion;
-    FFlist resolutions; //List of FFResolutionResult
-} FFDisplayServerResult;
-
 typedef struct FFTempValue
 {
     FFstrbuf name;
@@ -297,9 +279,6 @@ void ffLogoBuiltinListAutocompletion();
 // Detection functions //
 /////////////////////////
 
-//detection/displayServer.c
-const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance);
-
 //detection/terminalShell.c
 const FFTerminalShellResult* ffDetectTerminalShell(FFinstance* instance);
 

src/modules/cursor.c

@@ -4,6 +4,7 @@
 #include "common/parsing.h"
 #include "common/settings.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #include <stdlib.h>
 

src/modules/de.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/displayserver.h"
 
 #define FF_DE_MODULE_NAME "DE"
 #define FF_DE_NUM_FORMAT_ARGS 3

src/modules/font.c

@@ -4,6 +4,7 @@
 #include "common/parsing.h"
 #include "detection/qt.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #define FF_FONT_MODULE_NAME "Font"
 #define FF_FONT_NUM_FORMAT_ARGS 21

src/modules/icons.c

@@ -3,6 +3,7 @@
 #include "common/parsing.h"
 #include "detection/qt.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #define FF_ICONS_MODULE_NAME "Icons"
 #define FF_ICONS_NUM_FORMAT_ARGS 5

src/modules/resolution.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/displayserver.h"
 
 #define FF_RESOLUTION_MODULE_NAME "Resolution"
 #define FF_RESOLUTION_NUM_FORMAT_ARGS 3

src/modules/terminalfont.c

@@ -4,6 +4,7 @@
 #include "common/font.h"
 #include "common/settings.h"
 #include "common/processing.h"
+#include "detection/displayserver.h"
 
 #define FF_TERMFONT_MODULE_NAME "Terminal Font"
 #define FF_TERMFONT_NUM_FORMAT_ARGS 5

src/modules/theme.c

@@ -3,6 +3,7 @@
 #include "common/parsing.h"
 #include "detection/qt.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #define FF_THEME_MODULE_NAME "Theme"
 #define FF_THEME_NUM_FORMAT_ARGS 7

src/modules/wm.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/displayserver.h"
 
 #define FF_WM_MODULE_NAME "WM"
 #define FF_WM_NUM_FORMAT_ARGS 3

src/modules/wmtheme.c

@@ -4,6 +4,7 @@
 #include "common/parsing.h"
 #include "common/settings.h"
 #include "detection/gtk.h"
+#include "detection/displayserver.h"
 
 #include <stdlib.h>
 #include <string.h>