Global: make FFinstance instance a global variable

As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
+1 -1
View File
@@ -5,6 +5,6 @@
#include "fastfetch.h"
const char* ffDetectTheme(const FFinstance* instance, FFstrbuf* result);
const char* ffDetectTheme(FFstrbuf* result);
#endif
+6 -6
View File
@@ -3,17 +3,17 @@
#include "detection/gtk_qt/gtk_qt.h"
#include "detection/displayserver/displayserver.h"
const char* ffDetectTheme(const FFinstance* instance, FFstrbuf* result)
const char* ffDetectTheme(FFstrbuf* result)
{
const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
const FFDisplayServerResult* wmde = ffConnectDisplayServer();
if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0)
return "Theme isn't supported in TTY";
const FFQtResult* plasma = ffDetectQt(instance);
const FFstrbuf* gtk2 = &ffDetectGTK2(instance)->theme;
const FFstrbuf* gtk3 = &ffDetectGTK3(instance)->theme;
const FFstrbuf* gtk4 = &ffDetectGTK4(instance)->theme;
const FFQtResult* plasma = ffDetectQt();
const FFstrbuf* gtk2 = &ffDetectGTK2()->theme;
const FFstrbuf* gtk3 = &ffDetectGTK3()->theme;
const FFstrbuf* gtk4 = &ffDetectGTK4()->theme;
if(plasma->widgetStyle.length == 0 && plasma->colorScheme.length == 0 && gtk2->length == 0 && gtk3->length == 0 && gtk4->length == 0)
return "No themes found";
+1 -1
View File
@@ -1,6 +1,6 @@
#include "theme.h"
const char* ffDetectTheme(FF_MAYBE_UNUSED const FFinstance* instance, FF_MAYBE_UNUSED FFstrbuf* result)
const char* ffDetectTheme(FF_MAYBE_UNUSED FFstrbuf* result)
{
return "Not supported on this platform";
}