storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #246 from rokuyama/master

Browse Source 
For sixel, no need to round image size to multiple of character size.
This commit is contained in:
Tatsuya Kinoshita
2022-12-25 10:08:48 +09:00
committed by GitHub
parent 954dfbb27b 8d7db37efc
commit 9724f060ef
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
image.c
View File

@@ -247,7 +247,9 @@ drawImage(void)
if (enable_inline_image == INLINE_IMG_SIXEL) {
put_image_sixel(url, x, y, w, h, sx, sy, sw, sh, n_terminal_image);
w = i->cache->a_width > 0 ? i->width : 0;
h = i->cache->a_height > 0 ? i->height : 0;
put_image_sixel(url, x, y, w, h, i->sx, i->sy, sw * pixel_per_char, sh * pixel_per_line_i, n_terminal_image);
} else if (enable_inline_image == INLINE_IMG_OSC5379) {
put_image_osc5379(url, x, y, w, h, sx, sy, sw, sh);
} else if (enable_inline_image == INLINE_IMG_ITERM2) {

7
terms.c
View File

@@ -824,14 +824,13 @@ put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i
argv[n++] = "-l";
argv[n++] = do_anim ? "auto" : "disable";
argv[n++] = "-w";
sprintf(digit[0], "%d", w*pixel_per_char_i);
sprintf(digit[0], "%d", w);
argv[n++] = digit[0];
argv[n++] = "-h";
sprintf(digit[1], "%d", h*pixel_per_line_i);
sprintf(digit[1], "%d", h);
argv[n++] = digit[1];
argv[n++] = "-c";
sprintf(clip, "%dx%d+%d+%d", sw*pixel_per_char_i, sh*pixel_per_line_i,
sx*pixel_per_char_i, sy*pixel_per_line_i);
sprintf(clip, "%dx%d+%d+%d", sw, sh, sx, sy);
argv[n++] = clip;
argv[n++] = url;
if (getenv("TERM") && strcmp(getenv("TERM"), "screen") == 0 &&