fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-07 21:50:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

better support for building without features

Browse Source
This commit is contained in:
Linus Dierheimer
2021-10-19 18:44:59 +02:00
parent 73436824f9
commit 349e5b24fa
7 changed files with 222 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/settings.c
+88 -80
View File
@@ -2,12 +2,6 @@
#include <dlfcn.h>
#include <pthread.h>
#if FF_HAS_DCONF
# include <dconf.h> // Also included gio/gio.h
#endif
#if FF_HAS_SQLITE3
# include <sqlite3.h>
#endif
typedef void* DynamicLibrary;
@@ -29,7 +23,9 @@ typedef void* DynamicLibrary;
if(dlerror() != NULL) \
FF_LIBRARY_ERROR_RETURN(library, mutex, returnValue)
#if FF_HAS_DCONF
#ifdef FF_HAVE_GIO
#include <gio/gio.h>
typedef struct GVariantGetters
{
const gchar*(*ffg_variant_get_string)(GVariant*, gsize*);
@@ -56,61 +52,6 @@ static FFvariant getGVariantValue(GVariant* variant, FFvarianttype type, GVarian
return FF_VARIANT_NULL;
}
typedef struct DConfData
{
GVariant*(*ffdconf_client_read_full)(DConfClient*, const gchar*, DConfReadFlags, const GQueue*);
GVariantGetters variantGetters;
DConfClient* client;
} DConfData;
static FFvariant getDConfValue(DConfData* data, const char* key, FFvarianttype type)
{
if(data->client == NULL)
return FF_VARIANT_NULL;
GVariant* variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_FLAGS_NONE, NULL);
if(variant != NULL)
return getGVariantValue(variant, type, &data->variantGetters);
variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_USER_VALUE, NULL);
if(variant != NULL)
return getGVariantValue(variant, type, &data->variantGetters);
variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_DEFAULT_VALUE, NULL);
return getGVariantValue(variant, type, &data->variantGetters);
}
FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type)
{
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static bool init = false;
static DConfData data;
pthread_mutex_lock(&mutex);
if(init)
{
pthread_mutex_unlock(&mutex);
return getDConfValue(&data, key, type);
}
init = true;
data.client = NULL; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libDConf, "libdconf.so", mutex, FF_VARIANT_NULL);
data.ffdconf_client_read_full = FF_LIBRARY_LOAD_SYMBOL(library, "dconf_client_read_full", mutex, FF_VARIANT_NULL);
FF_LIBRARY_GVARIANT_GETTERS_INIT(library, data.variantGetters, mutex);
DConfClient*(*ffdconf_client_new)(void) = FF_LIBRARY_LOAD_SYMBOL(library, "dconf_client_new", mutex, FF_VARIANT_NULL);
if((data.client = ffdconf_client_new()) == NULL)
FF_LIBRARY_ERROR_RETURN(library, mutex, FF_VARIANT_NULL);
pthread_mutex_unlock(&mutex);
return getDConfValue(&data, key, type);
}
typedef struct GSettingsData
{
GSettingsSchemaSource* schemaSource;
@@ -187,6 +128,78 @@ FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, c
return getGSettingsValue(&data, schemaName, path, key, type);
}
#else //FF_HAVE_GIO
FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type)
{
return FF_VARIANT_NULL;
}
#endif //FF_HAVE_GIO
#ifdef FF_HAVE_DCONF
#include <dconf.h>
typedef struct DConfData
{
GVariant*(*ffdconf_client_read_full)(DConfClient*, const gchar*, DConfReadFlags, const GQueue*);
GVariantGetters variantGetters;
DConfClient* client;
} DConfData;
static FFvariant getDConfValue(DConfData* data, const char* key, FFvarianttype type)
{
if(data->client == NULL)
return FF_VARIANT_NULL;
GVariant* variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_FLAGS_NONE, NULL);
if(variant != NULL)
return getGVariantValue(variant, type, &data->variantGetters);
variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_USER_VALUE, NULL);
if(variant != NULL)
return getGVariantValue(variant, type, &data->variantGetters);
variant = data->ffdconf_client_read_full(data->client, key, DCONF_READ_DEFAULT_VALUE, NULL);
return getGVariantValue(variant, type, &data->variantGetters);
}
FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type)
{
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static bool init = false;
static DConfData data;
pthread_mutex_lock(&mutex);
if(init)
{
pthread_mutex_unlock(&mutex);
return getDConfValue(&data, key, type);
}
init = true;
data.client = NULL; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libDConf, "libdconf.so", mutex, FF_VARIANT_NULL);
data.ffdconf_client_read_full = FF_LIBRARY_LOAD_SYMBOL(library, "dconf_client_read_full", mutex, FF_VARIANT_NULL);
FF_LIBRARY_GVARIANT_GETTERS_INIT(library, data.variantGetters, mutex);
DConfClient*(*ffdconf_client_new)(void) = FF_LIBRARY_LOAD_SYMBOL(library, "dconf_client_new", mutex, FF_VARIANT_NULL);
if((data.client = ffdconf_client_new()) == NULL)
FF_LIBRARY_ERROR_RETURN(library, mutex, FF_VARIANT_NULL);
pthread_mutex_unlock(&mutex);
return getDConfValue(&data, key, type);
}
#else //FF_HAVE_DCONF
FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type)
{
return FF_VARIANT_NULL;
}
#endif //FF_HAVE_DCONF
FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type)
{
FFvariant gsettings = ffSettingsGetGSettings(instance, gsettingsSchemaName, gsettingsPath, gsettingsKey, type);
@@ -199,7 +212,8 @@ FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char*
return ffSettingsGetDConf(instance, dconfKey, type);
}
typedef struct _XfconfChannel XfconfChannel; // /usr/include/xfce4/xfconf-0/xfconf/xfconf-channel.h#L39
#ifdef FF_HAVE_XFCONF
#include <xfconf/xfconf.h>
typedef struct XFConfData
{
@@ -266,23 +280,16 @@ FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, con
pthread_mutex_unlock(&mutex);
return getXFConfValue(&data, channelName, propertyName, type);
}
#else
FFvariant ffSettingsGet(FFinstance*, const char*, const char*, const char*, const char*, FFvarianttype) {
#else //FF_HAVE_XFCONF
FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type)
{
return FF_VARIANT_NULL;
}
FFvariant ffSettingsGetDConf(FFinstance*, const char*, FFvarianttype) {
return FF_VARIANT_NULL;
}
FFvariant ffSettingsGetXFConf(FFinstance*, const char*, const char*, FFvarianttype) {
return FF_VARIANT_NULL;
}
FFvariant ffSettingsGetGSettings(FFinstance*, const char*, const char*, const char*, FFvarianttype) {
return FF_VARIANT_NULL;
}
#endif // FF_HAS_DCONF
#undef FF_VARIANT_NULL
#endif //FF_HAVE_XFCONF
#ifdef FF_HAVE_SQLITE3
#include <sqlite3.h>
#if FF_HAS_SQLITE3
typedef struct SQLiteData
{
int(*ffsqlite3_open_v2)(const char* filename, sqlite3** ppDb, int flags, const char* zVfs);
@@ -374,8 +381,9 @@ uint32_t ffSettingsGetSQLiteColumnCount(FFinstance* instance, const char* fileNa
pthread_mutex_unlock(&mutex);
return getSQLiteColumnCount(&data, fileName, tableName);
}
#else
uint32_t ffSettingsGetSQLiteColumnCount(FFinstance*, const char*, const char*) {
#else //FF_HAVE_SQLITE3
uint32_t ffSettingsGetSQLiteColumnCount(FFinstance* instance, const char* fileName, const char* tableName)
{
return 0;
}
#endif // FF_HAS_SQLITE3
#endif //FF_HAVE_SQLITE3
src/fastfetch.c
+38 -1
View File
@@ -43,7 +43,8 @@ static inline void printHelp()
" --print-default-config: prints the default config and exits\n"
" --print-default-structure: prints the default stucture and exits\n"
" --print-available-modules: prints a list of available modules and exits\n"
" --print-available-presets: list presets fastfetch knows about. They can be loaded with --load-config. (+)\n"
" --print-available-presets: list presets fastfetch knows about. They can be loaded with --load-config. (+)\n"
" --list-supported-features: list the supported features fastfetch was compiled with. Mainly for development.\n"
"\n"
"General options:\n"
" --structure <structure>: sets the structure of the fetch. Must be a colon separated list of keys. Use --print-available-modules to show the default\n"
@@ -577,6 +578,37 @@ static inline void listAvailablePresets(FFinstance* instance)
ffStrbufDestroy(&folder);
}
static inline void listSupportedFeatures()
{
fputs(
#ifdef FF_HAVE_LIBPCI
"libpci\n"
#endif
#ifdef FF_HAVE_X11
"x11\n"
#endif
#ifdef FF_HAVE_XRANDR
"xrandr\n"
#endif
#ifdef FF_HAVE_WAYLAND
"wayland\n"
#endif
#ifdef FF_HAVE_GIO
"gio\n"
#endif
#ifdef FF_HAVE_DCONF
"dconf\n"
#endif
#ifdef FF_HAVE_XFCONF
"xfconf\n"
#endif
#ifdef FF_HAVE_SQLITE3
"sqlite3\n"
#endif
""
, stdout);
}
static void parseOption(FFinstance* instance, FFdata* data, const char* key, const char* value);
static void parseConfigFile(FFinstance* instance, FFdata* data, FILE* file)
@@ -751,6 +783,11 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
listAvailablePresets(instance);
exit(0);
}
else if(strcasecmp(key, "--list-supported-features") == 0)
{
listSupportedFeatures();
exit(0);
}
else if(strcasecmp(key, "--spacing") == 0)
{
if(value == NULL)
src/modules/gpu.c
+14 -2
View File
@@ -1,12 +1,22 @@
#include "fastfetch.h"
#include <string.h>
#include <dlfcn.h>
#include <pci/pci.h>
#define FF_GPU_MODULE_NAME "GPU"
#define FF_GPU_NUM_FORMAT_ARGS 4
#ifndef FF_HAVE_LIBPCI
void ffPrintGPU(FFinstance* instance)
{
ffPrintError(instance, FF_GPU_MODULE_NAME, 0, &instance->config.gpuKey, &instance->config.gpuFormat, FF_GPU_NUM_FORMAT_ARGS, "Fastfetch was compiled without libpci support");
}
#else
#include <dlfcn.h>
#include <pci/pci.h>
static void printGPU(FFinstance* instance, struct pci_access* pacc, struct pci_dev* dev, FFcache* cache, uint8_t counter, char*(*ffpci_lookup_name)(struct pci_access*, char*, int, int, ...))
{
char vendor[512];
@@ -144,3 +154,5 @@ void ffPrintGPU(FFinstance* instance)
ffpci_cleanup(pacc);
dlclose(pci);
}
#endif
src/modules/resolution.c
+25 -32
View File
@@ -5,19 +5,11 @@
#include <dirent.h>
#include <pthread.h>
#if FF_HAS_X11
# include <X11/Xlib.h>
#endif
#if FF_HAS_XRANDR
# include <X11/extensions/Xrandr.h>
#endif
#if FF_HAS_WAYLAND
# include <wayland-client.h>
#endif
#define FF_RESOLUTION_MODULE_NAME "Resolution"
#define FF_RESOLUTION_NUM_FORMAT_ARGS 3
typedef void* DynamicLibrary;
#define FF_LIBRARY_LOAD(libraryNameUser, libraryNameDefault) dlopen(libraryNameUser.length == 0 ? libraryNameDefault : libraryNameUser.chars, RTLD_LAZY); \
if(dlerror() != NULL) \
return false;
@@ -28,8 +20,6 @@
return false; \
}
typedef void* DynamicLibrary;
typedef struct ResolutionResult
{
int width;
@@ -69,7 +59,6 @@ static bool printResolutionResultList(FFinstance* instance, FFlist* results)
return res;
}
#if FF_HAS_XRANDR || FF_HAS_WAYLAND
static int parseRefreshRate(int32_t refreshRate)
{
if(refreshRate <= 0)
@@ -87,7 +76,6 @@ static int parseRefreshRate(int32_t refreshRate)
return refreshRate;
}
#endif // FF_HAS_XRANDR || FF_HAS_WAYLAND
static void printResolutionDRMBackend(FFinstance* instance)
{
@@ -149,7 +137,9 @@ static void printResolutionDRMBackend(FFinstance* instance)
printResolutionResultList(instance, &modes);
}
#if FF_HAS_X11
#ifdef FF_HAVE_X11
#include <X11/Xlib.h>
static void x11AddScreenAsResult(FFlist* results, Screen* screen, int refreshRate)
{
if(WidthOfScreen(screen) == 0 || HeightOfScreen(screen) == 0)
@@ -186,9 +176,12 @@ static bool printResolutionX11Backend(FFinstance* instance)
return printResolutionResultList(instance, &results);
}
#endif // FF_HAS_XLIB
#if FF_HAS_XRANDR
#endif //FF_HAVE_X11
#ifdef FF_HAVE_XRANDR
#include <X11/extensions/Xrandr.h>
typedef struct XrandrData
{
XRRScreenConfiguration*(*ffXRRGetScreenInfo)(Display* display, Window window);
@@ -370,9 +363,11 @@ static bool printResolutionXrandrBackend(FFinstance* instance)
return printResolutionResultList(instance, &data.results);
}
#endif // FF_HAS_XRANDR
#endif // FF_HAVE_XRANDR
#ifdef FF_HAVE_WAYLAND
#include <wayland-client.h>
#if FF_HAS_WAYLAND
typedef struct WaylandData
{
FFinstance* instance;
@@ -517,25 +512,23 @@ static bool printResolutionWaylandBackend(FFinstance* instance)
return printResolutionResultList(instance, &data.results);
}
#endif // FF_HAS_WAYLAND
#endif //FF_HAVE_WAYLAND
void ffPrintResolution(FFinstance* instance)
{
if(
#if FF_HAS_WAYLAND
printResolutionWaylandBackend(instance) ||
#endif
#if FF_HAS_XRANDR
printResolutionXrandrBackend(instance) ||
#endif
#if FF_HAS_X11
printResolutionX11Backend(instance) ||
#endif
#if FF_HAVE_WAYLAND
printResolutionWaylandBackend(instance) ||
#endif
#if FF_HAVE_XRANDR
printResolutionXrandrBackend(instance) ||
#endif
#if FF_HAVE_X11
printResolutionX11Backend(instance) ||
#endif
false
) return;
printResolutionDRMBackend(instance);
}
#undef FF_LIBRARY_LOAD
#undef FF_LIBRARY_LOAD_SYMBOL