mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-10-29 00:03:58 +01:00
Terminal (Linux): better support for tmux
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#define FF_TERMINAL_NUM_FORMAT_ARGS 6
|
||||
#define FF_TERMINAL_NUM_FORMAT_ARGS 7
|
||||
|
||||
void ffPrintTerminal(FFTerminalOptions* options)
|
||||
{
|
||||
@@ -22,10 +22,18 @@ void ffPrintTerminal(FFTerminalOptions* options)
|
||||
{
|
||||
ffPrintLogoAndKey(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
|
||||
|
||||
ffStrbufWriteTo(&result->terminalPrettyName, stdout);
|
||||
|
||||
if(result->terminalVersion.length)
|
||||
printf("%s %s\n", result->terminalPrettyName.chars, result->terminalVersion.chars);
|
||||
else
|
||||
ffStrbufPutTo(&result->terminalPrettyName, stdout);
|
||||
{
|
||||
putchar(' ');
|
||||
ffStrbufWriteTo(&result->terminalVersion, stdout);
|
||||
}
|
||||
|
||||
if(result->terminalPlugins.length)
|
||||
printf(" (with %s)", result->terminalPlugins.chars);
|
||||
|
||||
putchar('\n');
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -36,6 +44,7 @@ void ffPrintTerminal(FFTerminalOptions* options)
|
||||
{FF_FORMAT_ARG_TYPE_UINT, &result->terminalPid},
|
||||
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalPrettyName},
|
||||
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalVersion},
|
||||
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalPlugins},
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -84,6 +93,7 @@ void ffGenerateTerminalJsonResult(FF_MAYBE_UNUSED FFTerminalOptions* options, yy
|
||||
yyjson_mut_obj_add_uint(doc, obj, "pid", result->terminalPid);
|
||||
yyjson_mut_obj_add_strbuf(doc, obj, "prettyName", &result->terminalPrettyName);
|
||||
yyjson_mut_obj_add_strbuf(doc, obj, "version", &result->terminalVersion);
|
||||
yyjson_mut_obj_add_strbuf(doc, obj, "plugins", &result->terminalPlugins);
|
||||
}
|
||||
|
||||
void ffPrintTerminalHelpFormat(void)
|
||||
@@ -94,7 +104,8 @@ void ffPrintTerminalHelpFormat(void)
|
||||
"Terminal exe name",
|
||||
"Terminal pid",
|
||||
"Terminal pretty name",
|
||||
"Terminal version"
|
||||
"Terminal version",
|
||||
"Terminal plugins (e.g. tmux)"
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user