diff --git a/src/common/init.c b/src/common/init.c index 960807b44..3f71de1d1 100644 --- a/src/common/init.c +++ b/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 #include diff --git a/src/detection/displayserver.h b/src/detection/displayserver.h new file mode 100644 index 000000000..d2075e85b --- /dev/null +++ b/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 + diff --git a/src/detection/displayserver/displayServer.h b/src/detection/displayserver/displayServer.h index 88a99bf46..74d04bb62 100644 --- a/src/detection/displayserver/displayServer.h +++ b/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" diff --git a/src/detection/gtk.c b/src/detection/gtk.c index bd4dbc314..79acb6b61 100644 --- a/src/detection/gtk.c +++ b/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 diff --git a/src/detection/qt.c b/src/detection/qt.c index 52a5b5b52..19c49768d 100644 --- a/src/detection/qt.c +++ b/src/detection/qt.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "detection/qt.h" #include "common/properties.h" +#include "detection/displayserver.h" #include #include diff --git a/src/fastfetch.h b/src/fastfetch.h index f5974ea6b..86b9ed71b 100644 --- a/src/fastfetch.h +++ b/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); diff --git a/src/modules/cursor.c b/src/modules/cursor.c index e50aec43b..05b54ac3d 100644 --- a/src/modules/cursor.c +++ b/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 diff --git a/src/modules/de.c b/src/modules/de.c index 4e090dcf1..c8214ce3f 100644 --- a/src/modules/de.c +++ b/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 diff --git a/src/modules/font.c b/src/modules/font.c index 952882180..2df295e80 100644 --- a/src/modules/font.c +++ b/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 diff --git a/src/modules/icons.c b/src/modules/icons.c index dad1e8aa9..2f837918c 100644 --- a/src/modules/icons.c +++ b/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 diff --git a/src/modules/resolution.c b/src/modules/resolution.c index 1872cc780..4b06e67be 100644 --- a/src/modules/resolution.c +++ b/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 diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index 428e1feac..1cdac5601 100644 --- a/src/modules/terminalfont.c +++ b/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 diff --git a/src/modules/theme.c b/src/modules/theme.c index 96d656dfe..3cec22be7 100644 --- a/src/modules/theme.c +++ b/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 diff --git a/src/modules/wm.c b/src/modules/wm.c index c3f6ffd75..5dcf230e4 100644 --- a/src/modules/wm.c +++ b/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 diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c index b256fdd1f..9abe944bc 100644 --- a/src/modules/wmtheme.c +++ b/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 #include