DE (Linux): uses COSMIC_VERSION if available

https://github.com/pop-os/cosmic-comp/issues/2425#issuecomment-5652401962
This commit is contained in:
Carter Li
2026-09-13 17:33:15 +08:00
parent 8334035927
commit cd5a2def9a
3 changed files with 12 additions and 1 deletions
+7 -1
View File
@@ -184,6 +184,12 @@ static const char* getTrinity(FFstrbuf* result, [[maybe_unused]] FFDEOptions* op
}
static const char* getCosmic(FFstrbuf* result, [[maybe_unused]] FFDEOptions* options) {
const char* env = getenv("COSMIC_VERSION");
if (env) {
ffStrbufSetS(result, env);
return nullptr;
}
if (ffProcessAppendStdOut(result, (char* const[]) { "cosmic-comp", "--version", nullptr }) == nullptr) {
// cosmic-comp 0.1.0 (git commit fa88002ba41d2edec25dd7ffdee9719fbb928fc0)
ffStrbufSubstrAfterFirstC(result, ' ');
@@ -256,7 +262,7 @@ const char* ffDetectDEVersion(const FFstrbuf* deName, FFstrbuf* result, FFDEOpti
getUnity(result, options);
} else if (ffStrbufEqualS(deName, "trinity")) {
getTrinity(result, options);
} else if (ffStrbufEqualS(deName, "COSMIC")) {
} else if (ffStrbufEqualS(deName, FF_DE_PRETTY_COSMIC)) {
getCosmic(result, options);
} else if (ffStrbufEqualS(deName, FF_DE_PRETTY_ENLIGHTENMENT)) {
getEnlightenment(result, options);
@@ -17,6 +17,7 @@
#define FF_DE_PRETTY_UKUI "UKUI"
#define FF_DE_PRETTY_NEBIDE "NebiDE"
#define FF_DE_PRETTY_ENLIGHTENMENT "Enlightenment"
#define FF_DE_PRETTY_COSMIC "COSMIC"
#define FF_WM_PRETTY_KWIN "KWin"
#define FF_WM_PRETTY_MUTTER "Mutter"
+4
View File
@@ -75,6 +75,10 @@ static const char* parseEnv(void) {
return "Sway";
}
if (getenv("COSMIC_VERSION") != nullptr) {
return "COSMIC";
}
#if __linux__ && !__ANDROID__
if (
getenv("WAYLAND_DISPLAY") != nullptr &&