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

Revert "Terminal (Linux): better support for tmux"

Browse Source 
This reverts commit 281af9c86f.
This commit is contained in:
李通洲
2023-10-24 10:09:43 +08:00
parent 281af9c86f
commit 40e2787d94
4 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/terminal/terminal.c
+5 -16
View File
@@ -6,7 +6,7 @@
#include <string.h>
#define FF_TERMINAL_NUM_FORMAT_ARGS 7
#define FF_TERMINAL_NUM_FORMAT_ARGS 6
void ffPrintTerminal(FFTerminalOptions* options)
{
@@ -22,18 +22,10 @@ void ffPrintTerminal(FFTerminalOptions* options)
{
ffPrintLogoAndKey(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
ffStrbufWriteTo(&result->terminalPrettyName, stdout);
if(result->terminalVersion.length)
{
putchar(' ');
ffStrbufWriteTo(&result->terminalVersion, stdout);
}
if(result->terminalPlugins.length)
printf(" (with %s)", result->terminalPlugins.chars);
putchar('\n');
printf("%s %s\n", result->terminalPrettyName.chars, result->terminalVersion.chars);
else
ffStrbufPutTo(&result->terminalPrettyName, stdout);
}
else
{
@@ -44,7 +36,6 @@ 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},
});
}
}
@@ -93,7 +84,6 @@ 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)
@@ -104,8 +94,7 @@ void ffPrintTerminalHelpFormat(void)
"Terminal exe name",
"Terminal pid",
"Terminal pretty name",
"Terminal version",
"Terminal plugins (e.g. tmux)"
"Terminal version"
});
}