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

rewrote shell / terminal detection

Browse Source
This commit is contained in:
Linus Dierheimer
2021-06-14 23:22:14 +02:00
parent ab2cb9e0e4
commit eab26149e7
11 changed files with 325 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/battery.c
+1 -1
View File
@@ -57,7 +57,7 @@ static void printBattery(FFinstance* instance, FFstrbuf* dir, uint32_t index)
putchar('%');
if(showStatus)
fputs(", ", stdout);
fputs("; ", stdout);
}
if(showStatus)
src/modules/host.c
+2 -1
View File
@@ -12,7 +12,8 @@ static bool hostValueSet(FFstrbuf* value)
ffStrbufIgnCaseCompS(value, "None") != 0 &&
ffStrbufIgnCaseCompS(value, "To be filled by O.E.M.") != 0 &&
ffStrbufIgnCaseCompS(value, "System Product Name") != 0 &&
ffStrbufIgnCaseCompS(value, "System Version") != 0
ffStrbufIgnCaseCompS(value, "System Version") != 0 &&
ffStrbufIgnCaseCompS(value, "Type1ProductConfigId") != 0
;
}
src/modules/shell.c
+33 -61
View File
@@ -4,81 +4,53 @@
#include <ctype.h>
#define FF_SHELL_MODULE_NAME "Shell"
#define FF_SHELL_NUM_FORMAT_ARGS 4
#define FF_SHELL_NUM_FORMAT_ARGS 7
void ffPrintShell(FFinstance* instance)
{
if(ffPrintFromCache(instance, FF_SHELL_MODULE_NAME, &instance->config.shellKey, &instance->config.shellFormat, FF_SHELL_NUM_FORMAT_ARGS))
return;
const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
char* shellPath = getenv("SHELL");
if(shellPath == NULL)
if(result->shellProcessName.length == 0)
{
ffPrintError(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shellKey, &instance->config.shellFormat, FF_SHELL_NUM_FORMAT_ARGS, "getenv(\"SHELL\") == NULL");
ffPrintError(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shellKey, &instance->config.shellFormat, FF_SHELL_NUM_FORMAT_ARGS, "Couldn't detect shell");
return;
}
char* shellName = strrchr(shellPath, '/');
if(shellName != NULL)
++shellName;
FFstrbuf shell;
ffStrbufInit(&shell);
ffStrbufAppendS(&shell, result->shellExeName);
FFstrbuf version;
ffStrbufInit(&version);
FFstrbuf command;
ffStrbufInit(&command);
ffStrbufAppendS(&command, "printf %s \"$");
ffStrbufAppendTransformS(&command, shellName != NULL ? shellName : shellPath, toupper);
ffStrbufAppendS(&command, "_VERSION\"");
ffProcessAppendStdOut(&version, (char* const[]){
shellPath,
"-c",
command.chars,
NULL
});
ffStrbufDestroy(&command);
FFstrbuf versionPretty;
ffStrbufInitCopy(&versionPretty, &version);
ffStrbufSubstrBeforeFirstC(&versionPretty, '(');
ffStrbufRemoveStrings(&versionPretty, 1, "-release");
char null = '\0';
if(shellName == NULL)
if(result->shellVersion.length > 0)
{
shellName = shellPath;
shellPath = &null;
ffStrbufAppendC(&shell, ' ');
ffStrbufAppend(&shell, &result->shellVersion);
}
if(instance->config.shellFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shellKey);
fputs(result->shellExeName, stdout);
if(result->shellVersion.length > 0)
{
putchar(' ');
ffStrbufWriteTo(&result->shellVersion, stdout);
}
putchar('\n');
}
else
{
*(shellName - 1) = '\0';
ffPrintFormatString(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shellKey, &instance->config.shellFormat, NULL, FF_SHELL_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
{FF_FORMAT_ARG_TYPE_STRING, &result->userShellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
});
}
FF_STRBUF_CREATE(shell);
ffStrbufSetS(&shell, shellName);
if(versionPretty.length > 0)
{
ffStrbufAppendC(&shell, ' ');
ffStrbufAppend(&shell, &versionPretty);
}
else if(version.length > 0)
{
ffStrbufAppendC(&shell, ' ');
ffStrbufAppend(&shell, &version);
}
ffPrintAndSaveToCache(instance, FF_SHELL_MODULE_NAME, &instance->config.shellKey, &shell, &instance->config.shellFormat, FF_SHELL_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRING, shellPath},
{FF_FORMAT_ARG_TYPE_STRING, shellName},
{FF_FORMAT_ARG_TYPE_STRBUF, &version},
{FF_FORMAT_ARG_TYPE_STRBUF, &versionPretty}
});
ffStrbufDestroy(&shell);
ffStrbufDestroy(&versionPretty);
ffStrbufDestroy(&version);
}
src/modules/terminal.c
+7 -116
View File
@@ -7,136 +7,27 @@
#define FF_TERMINAL_MODULE_NAME "Terminal"
#define FF_TERMINAL_NUM_FORMAT_ARGS 3
static inline void getTerminalFromEnv(FFTerminalResult* result)
{
char* term = getenv("TERM");
//TTY
if(term == NULL || strcasecmp(term, "linux") == 0)
term = ttyname(STDIN_FILENO);
ffStrbufSetS(&result->exeName, term);
ffStrbufSetS(&result->processName, term);
}
static void getTerminalName(FFinstance* instance, const char* pid, FFTerminalResult* result)
{
char statFile[234];
sprintf(statFile, "/proc/%s/stat", pid);
FILE* stat = fopen(statFile, "r");
if(stat == NULL)
{
ffStrbufSetF(&result->error, "fopen(\"%s\", \"r\") == NULL", statFile);
return;
}
char name[256];
char ppid[256];
if(fscanf(stat, "%*s (%255[^)])%*s%255s", name, ppid) != 2)
{
ffStrbufSetS(&result->error, "fscanf(stat, \"%*s (%[^)])%*s%s\", name, ppid) != 2");
fclose(stat);
return;
}
fclose(stat);
if (
strcasecmp(name, "bash") == 0 ||
strcasecmp(name, "sh") == 0 ||
strcasecmp(name, "zsh") == 0 ||
strcasecmp(name, "ksh") == 0 ||
strcasecmp(name, "fish") == 0 ||
strcasecmp(name, "sudo") == 0 ||
strcasecmp(name, "su") == 0 ||
strcasecmp(name, "doas") == 0 ||
strcasecmp(name, "strace") == 0 ||
strcasecmp(name, "gdb") == 0
) {
getTerminalName(instance, ppid, result);
return;
}
char cmdlineFile[234];
sprintf(cmdlineFile, "/proc/%s/cmdline", pid);
ffGetFileContent(cmdlineFile, &result->exeName);
ffStrbufSubstrBeforeFirstC(&result->exeName, '\0');
ffStrbufSubstrAfterLastC(&result->exeName, '/');
ffStrbufSetS(&result->processName, name);
}
const FFTerminalResult* ffDetectTerminal(FFinstance* instance)
{
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static FFTerminalResult result;
static bool init = false;
pthread_mutex_lock(&mutex);
if(init)
{
pthread_mutex_unlock(&mutex);
return &result;
}
init = true;
ffStrbufInit(&result.exeName);
ffStrbufInit(&result.processName);
ffStrbufInit(&result.error);
char ppid[256];
sprintf(ppid, "%i", getppid());
getTerminalName(instance, ppid, &result);
// This is mainly used when running in TTY. It also provides an fallback to $TERM if we _somehow_ failed
if(
ffStrbufStartsWithIgnCaseS(&result.exeName, "login") ||
ffStrbufIgnCaseCompS(&result.exeName, "systemd") == 0 ||
ffStrbufIgnCaseCompS(&result.exeName, "init") == 0 ||
ffStrbufIgnCaseCompS(&result.exeName, "(init)") == 0
) getTerminalFromEnv(&result);
pthread_mutex_unlock(&mutex);
return &result;
}
void ffPrintTerminal(FFinstance* instance)
{
const FFTerminalResult* result = ffDetectTerminal(instance);
const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
if(result->error.length > 0)
if(result->terminalProcessName.length == 0)
{
ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminalKey, &instance->config.terminalFormat, FF_TERMINAL_NUM_FORMAT_ARGS, result->error.chars);
ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminalKey, &instance->config.terminalFormat, FF_TERMINAL_NUM_FORMAT_ARGS, "Couldn't detect terminal");
return;
}
if(result->exeName.length == 0 && result->processName.length == 0)
{
ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminalKey, &instance->config.terminalFormat, FF_TERMINAL_NUM_FORMAT_ARGS, "Terminal names not set");
return;
}
const FFstrbuf* name;
if(ffStrbufStartsWith(&result->exeName, &result->processName))
name = &result->exeName;
else
name = &result->processName;
if(instance->config.terminalFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminalKey);
ffStrbufPutTo(name, stdout);
puts(result->terminalExeName);
}
else
{
ffPrintFormatString(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminalKey, &instance->config.terminalFormat, NULL, FF_TERMINAL_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result->exeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->processName},
{FF_FORMAT_ARG_TYPE_STRBUF, name}
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalExe},
{FF_FORMAT_ARG_TYPE_STRING, &result->terminalExeName}
});
}
}
src/modules/terminalfont.c
+9 -9
View File
@@ -207,26 +207,26 @@ static void printTTY(FFinstance* instance)
void ffPrintTerminalFont(FFinstance* instance)
{
const FFTerminalResult* result = ffDetectTerminal(instance);
const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
if(result->exeName.length == 0)
if(result->terminalProcessName.length == 0)
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Terminal font needs successfull terminal detection");
return;
}
if(ffStrbufIgnCaseCompS(&result->exeName, "konsole") == 0)
if(ffStrbufIgnCaseCompS(&result->terminalProcessName, "konsole") == 0)
printKonsole(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "xfce4-terminal") == 0)
else if(ffStrbufIgnCaseCompS(&result->terminalProcessName, "xfce4-terminal") == 0)
printXCFETerminal(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "lxterminal") == 0)
else if(ffStrbufIgnCaseCompS(&result->terminalProcessName, "lxterminal") == 0)
printTerminalFontFromConfigFile(instance, "lxterminal/lxterminal.conf", "fontname =");
else if(ffStrbufIgnCaseCompS(&result->exeName, "tilix") == 0)
else if(ffStrbufIgnCaseCompS(&result->terminalProcessName, "tilix") == 0)
printTerminalFontFromGSettings(instance, "/com/gexperts/Tilix/profiles/", "com.gexperts.Tilix.ProfilesList", "com.gexperts.Tilix.Profile");
else if(ffStrbufIgnCaseCompS(&result->exeName, "gnome-terminal-server") == 0)
else if(ffStrbufIgnCaseCompS(&result->terminalProcessName, "gnome-terminal-") == 0)
printTerminalFontFromGSettings(instance, "/org/gnome/terminal/legacy/profiles:/:", "org.gnome.Terminal.ProfilesList", "org.gnome.Terminal.Legacy.Profile");
else if(ffStrbufStartsWithIgnCaseS(&result->exeName, "/dev/tty"))
else if(ffStrbufStartsWithIgnCaseS(&result->terminalProcessName, "/dev/tty"))
printTTY(instance);
else
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Unknown terminal: %s", result->exeName.chars);
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Unknown terminal: %s", result->terminalProcessName.chars);
}