Logo (Image): fix paddingTop doesn't work with position: right

CarterLi · CarterLi · commit bdce8ea3a116 · 2024-07-25T21:41:15.000+08:00
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
@@ -55,7 +55,7 @@ static bool printImageIterm(bool printError)
                     fputs("Logo (iterm): Must set logo width when using position right\n", stderr);
                 return false;
             }
-            ffStrbufAppendF(&buf, "\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);
+            ffStrbufAppendF(&buf, "\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);
         }
         if (options->width)
             ffStrbufAppendF(&buf, "\e]1337;File=inline=1;width=%u:%s\a", (unsigned) options->width, base64.chars);
@@ -155,7 +155,7 @@ static bool printImageKittyDirect(bool printError)
                     fputs("Logo (iterm): Must set logo width when using position right\n", stderr);
                 return false;
             }
-            printf("\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);
+            printf("\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);
         }
 
         if (options->width)
diff --git a/src/logo/logo.c b/src/logo/logo.c
@@ -43,7 +43,7 @@ static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError
                     fputs("Logo (iterm): Must set logo width when using position right\n", stderr);
                 return false;
             }
-            ffStrbufAppendF(&buf, "\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);
+            ffStrbufAppendF(&buf, "\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);
         }
         ffStrbufAppendNS(&buf, (uint32_t) length, data);
         ffWriteFDBuffer(FFUnixFD2NativeFD(STDOUT_FILENO), &buf);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static bool printImageIterm(bool printError)`
`55`	`55`	`fputs("Logo (iterm): Must set logo width when using position right\n", stderr);`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`		`- ffStrbufAppendF(&buf, "\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);`
	`58`	`+ ffStrbufAppendF(&buf, "\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);`
`59`	`59`	`}`
`60`	`60`	`if (options->width)`
`61`	`61`	`ffStrbufAppendF(&buf, "\e]1337;File=inline=1;width=%u:%s\a", (unsigned) options->width, base64.chars);`
`@@ -155,7 +155,7 @@ static bool printImageKittyDirect(bool printError)`
`155`	`155`	`fputs("Logo (iterm): Must set logo width when using position right\n", stderr);`
`156`	`156`	`return false;`
`157`	`157`	`}`
`158`		`- printf("\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);`
	`158`	`+ printf("\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`if (options->width)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError`
`43`	`43`	`fputs("Logo (iterm): Must set logo width when using position right\n", stderr);`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`		`- ffStrbufAppendF(&buf, "\e[2J\e[3J\e[H\e[9999999C\e[%uD", (unsigned) options->paddingRight + options->width);`
	`46`	`+ ffStrbufAppendF(&buf, "\e[2J\e[3J\e[%u;9999999H\e[%uD", (unsigned) options->paddingTop + 1, (unsigned) options->paddingRight + options->width);`
`47`	`47`	`}`
`48`	`48`	`ffStrbufAppendNS(&buf, (uint32_t) length, data);`
`49`	`49`	`ffWriteFDBuffer(FFUnixFD2NativeFD(STDOUT_FILENO), &buf);`