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

Platform: align logic of getting host name to neofetch

Browse Source 
Fixes: #561
This commit is contained in:
李通洲
2023-09-18 13:52:25 +08:00
committed by 李通洲
parent b4f063e1da
commit 939165d4cf
6 changed files with 13 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/separator/separator.c
+1 -1
View File
@@ -29,7 +29,7 @@ void ffPrintSeparator(FFSeparatorOptions* options)
uint32_t titleLength = 1 // @
+ getWcsWidth(&platform->userName, wstr, &state) // user name
+ (fqdn ? platform->domainName.length : platform->hostName.length); // host name
+ (fqdn ? platform->hostName.length : ffStrbufFirstIndexC(&platform->hostName, '.')); // host name
ffLogoPrintLine();
if(options->string.length == 0)
src/modules/title/title.c
+6 -6
View File
@@ -23,9 +23,10 @@ static inline void printTitlePart(const FFstrbuf* content, const FFstrbuf* color
void ffPrintTitle(FFTitleOptions* options)
{
FFstrbuf* host = options->fqdn ?
&instance.state.platform.domainName :
&instance.state.platform.hostName;
FF_STRBUF_AUTO_DESTROY hostName = ffStrbufCreateCopy(&instance.state.platform.hostName);
if (!options->fqdn)
ffStrbufSubstrBeforeFirstC(&hostName, '.');
if (options->moduleArgs.outputFormat.length == 0)
{
@@ -37,14 +38,14 @@ void ffPrintTitle(FFTitleOptions* options)
ffPrintColor(&options->colorAt);
putchar('@');
printTitlePart(host, &options->colorHost);
printTitlePart(&hostName, &options->colorHost);
putchar('\n');
}
else
{
ffPrintFormat(FF_TITLE_MODULE_NAME, 0, &options->moduleArgs, FF_TITLE_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &instance.state.platform.userName},
{FF_FORMAT_ARG_TYPE_STRBUF, host},
{FF_FORMAT_ARG_TYPE_STRBUF, &hostName},
});
}
}
@@ -147,7 +148,6 @@ void ffGenerateTitleJson(FF_MAYBE_UNUSED FFTitleOptions* options, yyjson_mut_doc
yyjson_mut_obj_add_strbuf(doc, obj, "userName", &instance.state.platform.userName);
yyjson_mut_obj_add_strbuf(doc, obj, "homeDir", &instance.state.platform.homeDir);
yyjson_mut_obj_add_strbuf(doc, obj, "hostName", &instance.state.platform.hostName);
yyjson_mut_obj_add_strbuf(doc, obj, "domainName", &instance.state.platform.domainName);
yyjson_mut_obj_add_strbuf(doc, obj, "exePath", &instance.state.platform.exePath);
yyjson_mut_obj_add_strbuf(doc, obj, "userShell", &instance.state.platform.userShell);
}