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

TTY improvements

Browse Source
This commit is contained in:
Linus Dierheimer
2021-05-01 16:54:59 +02:00
parent e66e78fcc5
commit 94caa86998
6 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/detectWMDE.c
+23 -12
View File
@@ -267,6 +267,25 @@ static inline void getSessionType(FFWMDEResult* result, ProtocolHint protocolHin
getSessionTypeFallback(result, protocolHint);
}
static inline void getWMDE(FFWMDEResult* result)
{
ProcData procData;
procData.proc = opendir("/proc");
procData.dirent = NULL;
procData.protocolHint = FF_PROTOCOL_HINT_UNKNOWN;
procData.deHint = FF_DE_HINT_UNKNOWN;
getSessionDesktop(result);
getWM(result, &procData);
getDE(result, &procData);
if(result->wmProtocolName.length == 0 && procData.protocolHint != FF_PROTOCOL_HINT_UNKNOWN)
getSessionType(result, procData.protocolHint);
if(procData.proc != NULL)
closedir(procData.proc);
}
const FFWMDEResult* ffDetectWMDE(FFinstance* instance)
{
UNUSED(instance);
@@ -289,19 +308,11 @@ const FFWMDEResult* ffDetectWMDE(FFinstance* instance)
ffStrbufInit(&result.dePrettyName);
ffStrbufInit(&result.deVersion);
ProcData procData;
procData.proc = opendir("/proc");
procData.dirent = NULL;
procData.protocolHint = FF_PROTOCOL_HINT_UNKNOWN;
procData.deHint = FF_DE_HINT_UNKNOWN;
getSessionType(&result, FF_PROTOCOL_HINT_UNKNOWN);
getSessionDesktop(&result);
getWM(&result, &procData);
getDE(&result, &procData);
getSessionType(&result, procData.protocolHint);
if(procData.proc != NULL)
closedir(procData.proc);
//Don't run anyting when on TTY. This prevents us to catch process from other users in at least that case.
if(ffStrbufIgnCaseCompS(&result.wmProtocolName, "TTY") != 0)
getWMDE(&result);
pthread_mutex_unlock(&mutex);
src/common/processing.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <sys/wait.h>
void ffProcessGetStdOut(FFstrbuf* buffer, char* const argv[])
void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
{
int pipes[2];