fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #49 from DarNCelsius/master

Browse Source 
Enhanced LXQt DE Support
This commit is contained in:
Linus Dierheimer
2021-05-17 11:16:11 +02:00
committed by GitHub
parent 142d9c30e0 67edfd7f59
commit 2bb4407030
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -52,7 +52,7 @@ KWin, Mutter, Muffin, Marco, XFWM, Openbox (LXDE, LXQT & without DE)
##### DE versions
```
KDE Plasma, Gnome, Cinnamon, Mate, XFCE4
KDE Plasma, Gnome, Cinnamon, Mate, XFCE4, LXQt
```
##### Terminal fonts:
screenshots/ffmanjaro.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

src/common/detectWMDE.c
+33 -1
View File
@@ -19,7 +19,8 @@ typedef enum DEHint
FF_DE_HINT_GNOME,
FF_DE_HINT_CINNAMON,
FF_DE_HINT_XFCE4,
FF_DE_HINT_MATE
FF_DE_HINT_MATE,
FF_DE_HINT_LXQT
} DEHint;
typedef struct ProcData
@@ -150,6 +151,8 @@ static bool applyDEHintIfDE(const FFstrbuf* processName, DEHint* deHint)
*deHint = FF_DE_HINT_XFCE4;
else if(ffStrbufIgnCaseCompS(processName, "mate-session") == 0)
*deHint = FF_DE_HINT_MATE;
else if(ffStrbufIgnCaseCompS(processName, "lxqt-session") == 0)
*deHint = FF_DE_HINT_LXQT;
return *deHint != FF_DE_HINT_UNKNOWN;
}
@@ -275,6 +278,31 @@ static void getXFCE4(FFinstance* instance, FFWMDEResult* result)
}
}
static void getLXQt(FFinstance* instance, FFWMDEResult* result)
{
ffStrbufSetS(&result->deProcessName, "lxqt-session");
ffStrbufSetS(&result->dePrettyName, "LXQt");
ffParsePropFile("/usr/lib/pkgconfig/lxqt.pc", "Version:", &result->deVersion);
if(result->deVersion.length == 0)
ffParsePropFile("/usr/share/cmake/lxqt/lxqt-config.cmake", "set ( LXQT_VERSION", &result->deVersion);
if(result->deVersion.length == 0)
ffParsePropFile("/usr/share/cmake/lxqt/lxqt-config-version.cmake", "set ( PACKAGE_VERSION", &result->deVersion);
if(result->deVersion.length == 0 && instance->config.allowSlowOperations)
{
//This is really, really, really slow. Thank you, LXQt developers
ffProcessAppendStdOut(&result->deVersion, (char* const[]){
"lxqt-session",
"-v",
NULL
});
result->deVersion.length = 0; //don't set '\0' byte
ffGetPropValueFromLines(result->deVersion.chars , "liblxqt", &result->deVersion);
}
}
static inline void getDEFromHint(FFinstance* instance, FFWMDEResult* result, ProcData* procData)
{
getFromProcDir(result, procData, false);
@@ -292,6 +320,8 @@ static inline void getDEFromHint(FFinstance* instance, FFWMDEResult* result, Pro
getXFCE4(instance, result);
else if(procData->deHint == FF_DE_HINT_MATE)
getMate(instance, result);
else if(procData->deHint == FF_DE_HINT_LXQT)
getLXQt(instance, result);
}
static inline void getDE(FFinstance* instance, FFWMDEResult* result, ProcData* procData)
@@ -317,6 +347,8 @@ static inline void getDE(FFinstance* instance, FFWMDEResult* result, ProcData* p
getXFCE4(instance, result);
else if(strcasecmp(result->sessionDesktop, "MATE") == 0 || strcasecmp(result->sessionDesktop, "X-MATE") == 0)
getMate(instance, result);
else if(strcasecmp(result->sessionDesktop, "LXQt") == 0 || strcasecmp(result->sessionDesktop, "X-LXQT") == 0)
getLXQt(instance, result);
else
{
ffStrbufSetS(&result->deProcessName, result->sessionDesktop);