Refactor: move terminal/shell detection to own header

src/detection/displayserver.h

@@ -3,6 +3,8 @@
 #ifndef FF_INCLUDED_detection_displayserver
 #define FF_INCLUDED_detection_displayserver
 
+#include "fastfetch.h"
+
 typedef struct FFResolutionResult
 {
     uint32_t width;

src/detection/gtk.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_gtk
 #define FF_INCLUDED_detection_gtk
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFGTKResult
 {

src/detection/os.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_os
 #define FF_INCLUDED_detection_os
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFOSResult
 {

src/detection/qt.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_qt
 #define FF_INCLUDED_detection_qt
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFQtResult
 {

src/detection/terminalShell.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "detection/terminalshell.h"
 #include "common/io.h"
 #include "common/parsing.h"
 #include "common/processing.h"

src/detection/terminalshell.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_terminalshell
+#define FF_INCLUDED_detection_terminalshell
+
+#include "fastfetch.h"
+
+typedef struct FFTerminalShellResult
+{
+    FFstrbuf shellProcessName;
+    FFstrbuf shellExe;
+    const char* shellExeName; //pointer to a char in shellExe
+    FFstrbuf shellVersion;
+
+    FFstrbuf terminalProcessName;
+    FFstrbuf terminalExe;
+    const char* terminalExeName; //pointer to a char in terminalExe
+
+    FFstrbuf userShellExe;
+    const char* userShellExeName; //pointer to a char in userShellExe
+    FFstrbuf userShellVersion;
+} FFTerminalShellResult;
+
+const FFTerminalShellResult* ffDetectTerminalShell(FFinstance* instance);
+
+#endif

src/detection/title.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_title
 #define FF_INCLUDED_detection_title
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFTitleResult
 {