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

Fedora support

Browse Source
This commit is contained in:
Linus Dierheimer
2021-06-08 20:01:29 +02:00
parent 9535aa885c
commit 580ad45459
8 changed files with 178 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/init.c
+1
View File
@@ -161,6 +161,7 @@ static void defaultConfig(FFconfig* config)
ffStrbufInitA(&config->libDConf, 1);
ffStrbufInitA(&config->libWayland, 1);
ffStrbufInitA(&config->libXFConf, 1);
ffStrbufInitA(&config->libSQLite, 1);
ffStrbufInitA(&config->diskFolders, 1);
src/common/logo.c
+34 -1
View File
@@ -179,6 +179,36 @@ static void loadDebianLogo(FFlogo *logo, bool doColor)
sprintf(logo->chars[16], FASTFETCH_TEXT_MODIFIER_BOLT"%s `\"\"\" "FASTFETCH_TEXT_MODIFIER_RESET, color);
}
static void loadFedoraLogo(FFlogo* logo, bool doColor)
{
logo->width = 35;
logo->height = 17;
strcpy(logo->name, "fedora");
const char* blue = doColor ? "\033[34m" : "";
const char* white = doColor ? "\033[37m" : "";
strcpy(logo->color, "\033[34m");
sprintf(logo->chars[0], FASTFETCH_TEXT_MODIFIER_BOLT"%s /:-------------:\\ "FASTFETCH_TEXT_MODIFIER_RESET, blue);
sprintf(logo->chars[1], FASTFETCH_TEXT_MODIFIER_BOLT"%s :-------------------:: "FASTFETCH_TEXT_MODIFIER_RESET, blue);
sprintf(logo->chars[2], FASTFETCH_TEXT_MODIFIER_BOLT"%s :-----------%s/shhOHbmp$%s---:\\ "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[3], FASTFETCH_TEXT_MODIFIER_BOLT"%s /-----------%somMMMNNNMMD %s---: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[4], FASTFETCH_TEXT_MODIFIER_BOLT"%s :-----------%ssMMMMNMNMP%s. ---: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[5], FASTFETCH_TEXT_MODIFIER_BOLT"%s :-----------%s:MMMdP%s------- ---\\"FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[6], FASTFETCH_TEXT_MODIFIER_BOLT"%s ,------------%s:MMMd%s-------- ---:"FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[7], FASTFETCH_TEXT_MODIFIER_BOLT"%s :------------%s:MMMd%s------- .---:"FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[8], FASTFETCH_TEXT_MODIFIER_BOLT"%s :---- %soNMMMMMMMMMNho%s .----:"FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[9], FASTFETCH_TEXT_MODIFIER_BOLT"%s :-- .%s+shhhMMMmhhy++%s .------/"FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[10], FASTFETCH_TEXT_MODIFIER_BOLT"%s :- -------%s:MMMd%s--------------: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[11], FASTFETCH_TEXT_MODIFIER_BOLT"%s :- --------%s/MMMd%s-------------; "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[12], FASTFETCH_TEXT_MODIFIER_BOLT"%s :- ------%s/hMMMy%s------------: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[13], FASTFETCH_TEXT_MODIFIER_BOLT"%s :--%s :dMNdhhdNMMNo%s------------; "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[14], FASTFETCH_TEXT_MODIFIER_BOLT"%s :---%s:sdNMMMMNds:%s------------: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[15], FASTFETCH_TEXT_MODIFIER_BOLT"%s :------%s:://:%s-------------:: "FASTFETCH_TEXT_MODIFIER_RESET, blue, white, blue);
sprintf(logo->chars[16], FASTFETCH_TEXT_MODIFIER_BOLT"%s :---------------------:// "FASTFETCH_TEXT_MODIFIER_RESET, blue);
}
static void loadManjaroLogo(FFlogo *logo, bool doColor)
{
logo->width = 28;
@@ -320,6 +350,8 @@ void ffLoadLogoSet(FFconfig* config, const char* logo)
loadDebianLogo(&config->logo, config->colorLogo);
else if(strcasecmp(logo, "manjaro") == 0)
loadManjaroLogo(&config->logo, config->colorLogo);
else if(strcasecmp(logo, "fedora") == 0)
loadFedoraLogo(&config->logo, config->colorLogo);
else if(strcasecmp(logo, "void") == 0)
loadVoidLogo(&config->logo, config->colorLogo);
else if(strcasecmp(logo, "garuda") == 0)
@@ -408,7 +440,7 @@ void ffPrintRemainingLogo(FFinstance* instance)
static FFlogo* getLogos(uint8_t* size, bool color)
{
#define FASTFETCH_LOGO_AMOUNT 9
#define FASTFETCH_LOGO_AMOUNT 10
*size = FASTFETCH_LOGO_AMOUNT;
static FFlogo logos[FASTFETCH_LOGO_AMOUNT];
@@ -424,6 +456,7 @@ static FFlogo* getLogos(uint8_t* size, bool color)
loadDebianLogo(&logos[6], color);
loadManjaroLogo(&logos[7], color);
loadVoidLogo(&logos[8], color);
loadFedoraLogo(&logos[9], color);
return logos;
}
src/common/settings.c
+121 -28
View File
@@ -3,26 +3,27 @@
#include <dlfcn.h>
#include <pthread.h>
#include <dconf.h> // Also included gio/gio.h
#include <sqlite3.h>
typedef void* DynamicLibrary;
#define FF_VARIANT_NULL ((FFvariant){.strValue = NULL})
#define FF_LIBRARY_LOAD(libraryNameUser, libraryNameDefault, mutex) dlopen(libraryNameUser.length == 0 ? libraryNameDefault : libraryNameUser.chars, RTLD_LAZY); \
#define FF_LIBRARY_LOAD(libraryNameUser, libraryNameDefault, mutex, returnValue) dlopen(libraryNameUser.length == 0 ? libraryNameDefault : libraryNameUser.chars, RTLD_LAZY); \
if(dlerror() != NULL) { \
pthread_mutex_unlock(&mutex); \
return FF_VARIANT_NULL; \
return returnValue; \
}
#define FF_LIBRARY_ERROR_RETURN(library, mutex) { \
#define FF_LIBRARY_ERROR_RETURN(library, mutex, returnValue) { \
pthread_mutex_unlock(&mutex); \
dlclose(library); \
return FF_VARIANT_NULL; \
return returnValue; \
}
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, mutex) dlsym(library, symbolName); \
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, mutex, returnValue) dlsym(library, symbolName); \
if(dlerror() != NULL) \
FF_LIBRARY_ERROR_RETURN(library, mutex)
FF_LIBRARY_ERROR_RETURN(library, mutex, returnValue)
typedef struct GVariantGetters
{
@@ -31,8 +32,8 @@ typedef struct GVariantGetters
} GVariantGetters;
#define FF_LIBRARY_GVARIANT_GETTERS_INIT(library, object, mutex) \
object.ffg_variant_get_string = FF_LIBRARY_LOAD_SYMBOL(library, "g_variant_get_string", mutex); \
object.ffg_variant_get_boolean = FF_LIBRARY_LOAD_SYMBOL(library, "g_variant_get_boolean", mutex);
object.ffg_variant_get_string = FF_LIBRARY_LOAD_SYMBOL(library, "g_variant_get_string", mutex, FF_VARIANT_NULL); \
object.ffg_variant_get_boolean = FF_LIBRARY_LOAD_SYMBOL(library, "g_variant_get_boolean", mutex, FF_VARIANT_NULL);
static FFvariant getGVariantValue(GVariant* variant, FFvarianttype type, GVariantGetters* variantGetters)
{
@@ -90,14 +91,14 @@ FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttyp
data.client = NULL; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libDConf, "libdconf.so", mutex);
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);
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);
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_LIBRARY_ERROR_RETURN(library, mutex, FF_VARIANT_NULL);
pthread_mutex_unlock(&mutex);
return getDConfValue(&data, key, type);
@@ -161,19 +162,19 @@ FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, c
data.schemaSource = NULL; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libGIO, "libgio-2.0.so", mutex);
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libGIO, "libgio-2.0.so", mutex, FF_VARIANT_NULL);
data.ffg_settings_schema_source_lookup = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_source_lookup", mutex);
data.ffg_settings_schema_has_key = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_has_key", mutex);
data.ffg_settings_new_full = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_new_full", mutex);
data.ffg_settings_get_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_value", mutex);
data.ffg_settings_get_user_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_user_value", mutex);
data.ffg_settings_get_default_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_default_value", mutex);
data.ffg_settings_schema_source_lookup = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_source_lookup", mutex, FF_VARIANT_NULL);
data.ffg_settings_schema_has_key = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_has_key", mutex, FF_VARIANT_NULL);
data.ffg_settings_new_full = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_new_full", mutex, FF_VARIANT_NULL);
data.ffg_settings_get_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_value", mutex, FF_VARIANT_NULL);
data.ffg_settings_get_user_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_user_value", mutex, FF_VARIANT_NULL);
data.ffg_settings_get_default_value = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_get_default_value", mutex, FF_VARIANT_NULL);
FF_LIBRARY_GVARIANT_GETTERS_INIT(library, data.variantGetters, mutex);
GSettingsSchemaSource*(*ffg_settings_schema_source_get_default)(void) = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_source_get_default", mutex);
GSettingsSchemaSource*(*ffg_settings_schema_source_get_default)(void) = FF_LIBRARY_LOAD_SYMBOL(library, "g_settings_schema_source_get_default", mutex, FF_VARIANT_NULL);
if((data.schemaSource = ffg_settings_schema_source_get_default()) == NULL)
FF_LIBRARY_ERROR_RETURN(library, mutex);
FF_LIBRARY_ERROR_RETURN(library, mutex, FF_VARIANT_NULL);
pthread_mutex_unlock(&mutex);
return getGSettingsValue(&data, schemaName, path, key, type);
@@ -236,19 +237,111 @@ FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, con
data.init = false; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libXFConf, "libxfconf-0.so", mutex);
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libXFConf, "libxfconf-0.so", mutex, FF_VARIANT_NULL);
data.ffxfconf_channel_get = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get", mutex);
data.ffxfconf_channel_has_property = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_has_property", mutex);
data.ffxfconf_channel_get_string = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get_string", mutex);
data.ffxfconf_channel_get_bool = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get_bool", mutex);
data.ffxfconf_channel_get = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get", mutex, FF_VARIANT_NULL);
data.ffxfconf_channel_has_property = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_has_property", mutex, FF_VARIANT_NULL);
data.ffxfconf_channel_get_string = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get_string", mutex, FF_VARIANT_NULL);
data.ffxfconf_channel_get_bool = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_channel_get_bool", mutex, FF_VARIANT_NULL);
gboolean(*ffxfconf_init)(GError **) = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_init", mutex);
gboolean(*ffxfconf_init)(GError **) = FF_LIBRARY_LOAD_SYMBOL(library, "xfconf_init", mutex, FF_VARIANT_NULL);
if((data.init = ffxfconf_init(NULL)) == FALSE)
FF_LIBRARY_ERROR_RETURN(library, mutex);
FF_LIBRARY_ERROR_RETURN(library, mutex, FF_VARIANT_NULL);
pthread_mutex_unlock(&mutex);
return getXFConfValue(&data, channelName, propertyName, type);
}
#undef FF_VARIANT_NULL
typedef struct SQLiteData
{
int(*ffsqlite3_open_v2)(const char* filename, sqlite3** ppDb, int flags, const char* zVfs);
int(*ffsqlite3_prepare_v2)(sqlite3* db, const char* zSql, int nByte, sqlite3_stmt** ppStmt, const char** pzTail);
int(*ffsqlite3_step)(sqlite3_stmt* pStmt);
int(*ffsqlite3_data_count)(sqlite3_stmt* pStmt);
int(*ffsqlite3_column_int)(sqlite3_stmt* pStmt, int iCol);
int(*ffsqlite3_finalize)(sqlite3_stmt* pStmt);
int(*ffsqlite3_close)(sqlite3* db);
} SQLiteData;
static inline void closeSQLiteHandles(const SQLiteData* data, sqlite3* db, sqlite3_stmt* stmt)
{
if(data->ffsqlite3_finalize != NULL && stmt != NULL)
data->ffsqlite3_finalize(stmt);
if(data->ffsqlite3_close != NULL && db != NULL)
data->ffsqlite3_close(db);
}
uint32_t getSQLiteColumnCount(const SQLiteData* data, const char* fileName, const char* tableName)
{
if(data->ffsqlite3_open_v2 == NULL)
return 0;
sqlite3* db;
if(data->ffsqlite3_open_v2(fileName, &db, SQLITE_OPEN_READONLY, NULL) != SQLITE_OK)
return 0;
FFstrbuf sql;
ffStrbufInit(&sql);
ffStrbufAppendS(&sql, "SELECT COUNT(*) FROM ");
ffStrbufAppendS(&sql, tableName);
sqlite3_stmt* stmt = NULL;
int ret = data->ffsqlite3_prepare_v2(db, sql.chars, sql.length + 1, &stmt, NULL);
ffStrbufDestroy(&sql);
if(ret != SQLITE_OK)
{
closeSQLiteHandles(data, db, stmt);
return 0;
}
if(data->ffsqlite3_step(stmt) != SQLITE_ROW)
{
closeSQLiteHandles(data, db, stmt);
return 0;
}
if(data->ffsqlite3_data_count(stmt) < 1)
{
closeSQLiteHandles(data, db, stmt);
return 0;
}
int count = data->ffsqlite3_column_int(stmt, 0);
closeSQLiteHandles(data, db, stmt);
return count;
}
uint32_t ffSettingsGetSQLiteColumnCount(FFinstance* instance, const char* fileName, const char* tableName)
{
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static bool init = false;
static SQLiteData data;
pthread_mutex_lock(&mutex);
if(init)
{
pthread_mutex_unlock(&mutex);
return getSQLiteColumnCount(&data, fileName, tableName);
}
init = true;
data.ffsqlite3_open_v2 = NULL; //error indicator
DynamicLibrary library = FF_LIBRARY_LOAD(instance->config.libSQLite, "libsqlite3.so", mutex, 0);
data.ffsqlite3_open_v2 = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_open_v2", mutex, 0);
data.ffsqlite3_prepare_v2 = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_prepare_v2", mutex, 0);
data.ffsqlite3_step = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_step", mutex, 0);
data.ffsqlite3_data_count = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_data_count", mutex, 0);
data.ffsqlite3_column_int = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_column_int", mutex, 0);
data.ffsqlite3_finalize = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_finalize", mutex, 0);
data.ffsqlite3_close = FF_LIBRARY_LOAD_SYMBOL(library, "sqlite3_close", mutex, 0);
pthread_mutex_unlock(&mutex);
return getSQLiteColumnCount(&data, fileName, tableName);
}