diff --git a/src/common/settings.c b/src/common/settings.c index c2b631a02..36addafea 100644 --- a/src/common/settings.c +++ b/src/common/settings.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/settings.h" #include "common/library.h" #include "common/io.h" diff --git a/src/common/settings.h b/src/common/settings.h new file mode 100644 index 000000000..e0413e608 --- /dev/null +++ b/src/common/settings.h @@ -0,0 +1,37 @@ +#pragma once + +#ifndef FF_INCLUDED_common_settings +#define FF_INCLUDED_common_settings + +#include "fastfetch.h" + +typedef enum FFvarianttype +{ + FF_VARIANT_TYPE_STRING, + FF_VARIANT_TYPE_BOOL, + FF_VARIANT_TYPE_INT +} FFvarianttype; + +typedef union FFvariant +{ + const char* strValue; + int32_t intValue; + struct + { + bool boolValueSet; + bool boolValue; + }; +} FFvariant; + +FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type); +FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type); +FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type); +FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type); + +int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query); + +#ifdef __ANDROID__ +bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result); +#endif + +#endif diff --git a/src/detection/gtk.c b/src/detection/gtk.c index efdf70fa9..86e850467 100644 --- a/src/detection/gtk.c +++ b/src/detection/gtk.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/settings.h" #include diff --git a/src/fastfetch.h b/src/fastfetch.h index 45f6b43a7..d154fde61 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -329,24 +329,6 @@ typedef struct FFformatarg const void* value; } FFformatarg; -typedef enum FFvarianttype -{ - FF_VARIANT_TYPE_STRING, - FF_VARIANT_TYPE_BOOL, - FF_VARIANT_TYPE_INT -} FFvarianttype; - -typedef union FFvariant -{ - const char* strValue; - int32_t intValue; - struct - { - bool boolValueSet; - bool boolValue; - }; -} FFvariant; - #define FF_VARIANT_NULL ((FFvariant){.strValue = NULL}) ////////////////////// @@ -373,18 +355,6 @@ void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[]); //common/networking.c void ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, FFstrbuf* buffer); -//common/settings.c -FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type); -FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type); -FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type); -FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type); - -int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query); - -#ifdef __ANDROID__ -bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result); -#endif - //////////////////// // Logo functions // //////////////////// diff --git a/src/modules/cursor.c b/src/modules/cursor.c index f61da9c6e..18b756d0a 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -2,6 +2,7 @@ #include "common/properties.h" #include "common/printing.h" #include "common/parsing.h" +#include "common/settings.h" #include diff --git a/src/modules/packages.c b/src/modules/packages.c index e4b0b8549..7f18ed3b4 100644 --- a/src/modules/packages.c +++ b/src/modules/packages.c @@ -2,6 +2,7 @@ #include "common/io.h" #include "common/properties.h" #include "common/printing.h" +#include "common/settings.h" #include #include diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index e9e7d5347..27859bf33 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -2,6 +2,7 @@ #include "common/properties.h" #include "common/printing.h" #include "common/font.h" +#include "common/settings.h" #define FF_TERMFONT_MODULE_NAME "Terminal Font" #define FF_TERMFONT_NUM_FORMAT_ARGS 5 diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c index 9e1a38d85..ee600e2bb 100644 --- a/src/modules/wmtheme.c +++ b/src/modules/wmtheme.c @@ -2,6 +2,7 @@ #include "common/properties.h" #include "common/printing.h" #include "common/parsing.h" +#include "common/settings.h" #include #include