From b63e6a30530ccdb1fd5a86b9d519f47a09723ad1 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 12 Dec 2023 18:20:02 +0800 Subject: [PATCH] DE (Linux): add support for CDE Fix #658 --- src/detection/displayserver/displayserver.h | 2 ++ src/detection/displayserver/linux/wmde.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/detection/displayserver/displayserver.h b/src/detection/displayserver/displayserver.h index 7a5ebb8f8..b5655a84f 100644 --- a/src/detection/displayserver/displayserver.h +++ b/src/detection/displayserver/displayserver.h @@ -11,6 +11,7 @@ #define FF_DE_PRETTY_LXDE "LXDE" #define FF_DE_PRETTY_LXQT "LXQT" #define FF_DE_PRETTY_BUDGIE "Budgie" +#define FF_DE_PRETTY_CDE "CDE" #define FF_DE_PRETTY_UNITY "Unity" #define FF_WM_PRETTY_KWIN "KWin" @@ -32,6 +33,7 @@ #define FF_WM_PRETTY_HERBSTLUFTWM "herbstluftwm" #define FF_WM_PRETTY_ICEWM "IceWM" #define FF_WM_PRETTY_SPECTRWM "spectrwm" +#define FF_WM_PRETTY_DTWM "dtwm" #define FF_WM_PROTOCOL_TTY "TTY" diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 5eaeab15a..5f421ff0e 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -114,6 +114,8 @@ static void applyPrettyNameIfWM(FFDisplayServerResult* result, const char* name) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_HERBSTLUFTWM); else if(strcasecmp(name, "icewm") == 0) ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_ICEWM); + else if(strcasecmp(name, "dtwm") == 0) + ffStrbufSetS(&result->wmPrettyName, FF_WM_PRETTY_DTWM); } static void applyNameIfWM(FFDisplayServerResult* result, const char* processName) @@ -217,6 +219,13 @@ static void applyPrettyNameIfDE(FFDisplayServerResult* result, const char* name) ffStrbufSetS(&result->deProcessName, "budgie-desktop"); ffStrbufSetS(&result->dePrettyName, FF_DE_PRETTY_BUDGIE); } + + else if( + strcasecmp(name, "dtsession") == 0 + ) { + ffStrbufSetS(&result->deProcessName, "dtsession"); + ffStrbufSetS(&result->dePrettyName, FF_DE_PRETTY_CDE); + } } static void getWMProtocolNameFromEnv(FFDisplayServerResult* result)