Unified WM / DE / Resolution detection

This commit is contained in:
Linus Dierheimer
2022-01-02 16:55:26 +01:00
parent 06fa8e7478
commit bcf543e129
22 changed files with 948 additions and 937 deletions
+4 -4
View File
@@ -341,7 +341,7 @@ bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer)
return ffParsePropFileValues(filename, 1, (FFpropquery[]){{start, buffer}});
}
bool ffParsePropFileHomeValues(FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
bool ffParsePropFileHomeValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
{
FFstrbuf absolutePath;
ffStrbufInitA(&absolutePath, 64);
@@ -356,12 +356,12 @@ bool ffParsePropFileHomeValues(FFinstance* instance, const char* relativeFile, u
return result;
}
bool ffParsePropFileHome(FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
bool ffParsePropFileHome(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
{
return ffParsePropFileHomeValues(instance, relativeFile, 1, (FFpropquery[]){{start, buffer}});
}
bool ffParsePropFileConfigValues(FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
bool ffParsePropFileConfigValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
{
bool foundAFile = false;
@@ -397,7 +397,7 @@ bool ffParsePropFileConfigValues(FFinstance* instance, const char* relativeFile,
return foundAFile;
}
bool ffParsePropFileConfig(FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
bool ffParsePropFileConfig(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
{
return ffParsePropFileConfigValues(instance, relativeFile, 1, (FFpropquery[]){{start, buffer}});
}
+5 -5
View File
@@ -26,9 +26,9 @@ static inline void* detectGTK4ThreadMain(void* instance)
return NULL;
}
static inline void* detectWMDEThreadMain(void* instance)
static inline void* connectDisplayServerThreadMain(void* instance)
{
ffDetectWMDE((FFinstance*)instance);
ffConnectDisplayServer((FFinstance*)instance);
return NULL;
}
@@ -40,9 +40,9 @@ static inline void* detectTerminalShellThreadMain(void* instance)
static inline void* startThreadsThreadMain(void* instance)
{
pthread_t wmdeThread;
pthread_create(&wmdeThread, NULL, detectWMDEThreadMain, instance);
pthread_detach(wmdeThread);
pthread_t dsThread;
pthread_create(&dsThread, NULL, connectDisplayServerThreadMain, instance);
pthread_detach(dsThread);
pthread_t gtk2Thread;
pthread_create(&gtk2Thread, NULL, detectGTK2ThreadMain, instance);