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

Logo: simplify code

Browse Source
This commit is contained in:
李通洲
2023-09-03 19:55:57 +08:00
parent 33f121d7fb
commit 9e839d3b8b
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logo/image/image.c
+4 -5
View File
@@ -77,7 +77,7 @@ static bool printImageIterm(void)
ffStrbufAppendC(&buf, ' ');
instance.state.logoWidth = instance.config.logo.width + instance.config.logo.paddingLeft + instance.config.logo.paddingRight;
instance.state.logoHeight = instance.config.logo.paddingTop + instance.config.logo.height;
ffStrbufAppendF(&buf, "\e]1337;File=inline=1;width=%u;height=%u;preserveAspectRatio=%u:%s\a\e[9999999D\n\e[%uA",
ffStrbufAppendF(&buf, "\e]1337;File=inline=1;width=%u;height=%u;preserveAspectRatio=%u:%s\a\n\e[%uA",
(unsigned) instance.config.logo.width,
(unsigned) instance.config.logo.height,
(unsigned) instance.config.logo.preserveAspectRadio,
@@ -121,7 +121,7 @@ static bool printImageKittyDirect(void)
instance.state.logoWidth = instance.config.logo.width + instance.config.logo.paddingLeft + instance.config.logo.paddingRight;
instance.state.logoHeight = instance.config.logo.paddingTop + instance.config.logo.height;
printf("\e_Ga=T,f=100,t=f,c=%u,r=%u;%s\e\\\e[9999999D\n\e[%uA",
printf("\e_Ga=T,f=100,t=f,c=%u,r=%u;%s\e\\\n\e[%uA",
(unsigned) instance.config.logo.width,
(unsigned) instance.config.logo.height,
base64.chars,
@@ -265,8 +265,7 @@ static void printImagePixels(FFLogoRequestData* requestData, const FFstrbuf* res
ffWriteFDBuffer(FFUnixFD2NativeFD(STDOUT_FILENO), result);
//Go to upper left corner
fputs("\033[9999999D", stdout);
printf("\033[%uA", instance.state.logoHeight);
printf("\e[1G\e[%uA", instance.state.logoHeight);
}
static bool printImageSixel(FFLogoRequestData* requestData, const ImageData* imageData)
@@ -639,7 +638,7 @@ static bool printCachedPixel(FFLogoRequestData* requestData)
instance.state.logoHeight = requestData->logoCharacterHeight + instance.config.logo.paddingTop;
//Go to upper left corner
printf("\033[9999999D\033[%uA", instance.state.logoHeight);
printf("\e[1G\e[%uA", instance.state.logoHeight);
return true;
}
src/logo/logo.c
+3 -7
View File
@@ -50,7 +50,7 @@ static void ffLogoPrintCharsRaw(const char* data, size_t length)
ffStrbufAppendNS(&buf, (uint32_t) length, data);
instance.state.logoHeight = options->paddingTop + options->height;
instance.state.logoWidth = options->paddingLeft + options->width + options->paddingRight;
ffStrbufAppendF(&buf, "\e[9999999D\n\e[%uA", instance.state.logoHeight);
ffStrbufAppendF(&buf, "\n\e[%uA", instance.state.logoHeight);
ffWriteFDBuffer(FFUnixFD2NativeFD(STDOUT_FILENO), &buf);
}
}
@@ -197,12 +197,8 @@ void ffLogoPrintChars(const char* data, bool doColorReplacement)
instance.state.logoWidth += options->paddingLeft + options->paddingRight;
//Go to the leftmost position
fputs("\033[9999999D", stdout);
//If the logo height is > 1, go up the height
if(instance.state.logoHeight > 0)
printf("\033[%uA", instance.state.logoHeight);
//Go to the leftmost position and go up the height
printf("\e[1G\e[%uA", instance.state.logoHeight);
}
static void logoApplyColors(const FFlogo* logo)