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

Avoid having external programs download images

Browse Source
This commit is contained in:
bptato
2021-02-02 16:40:27 +01:00
parent c5cd2b5716
commit f88e49826d
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image.c
+19 -6
View File
@@ -214,7 +214,8 @@ drawImage()
i = &terminal_image[j]; i = &terminal_image[j];
if (enable_inline_image) { if (enable_inline_image) {
#if 0 #if 0
if(stat(i->cache->file, &st)) {
fprintf(stderr,"file %s x %d y %d w %d h %d sx %d sy %d sw %d sh %d (ppc %d ppl %d)\n", fprintf(stderr,"file %s x %d y %d w %d h %d sx %d sy %d sw %d sh %d (ppc %d ppl %d)\n",
((enable_inline_image == 2 || getenv("WINDOWID")) && ((enable_inline_image == 2 || getenv("WINDOWID")) &&
i->cache->touch) ? i->cache->file : i->cache->url, i->cache->touch) ? i->cache->file : i->cache->url,
@@ -223,11 +224,17 @@ drawImage()
i->cache->height > 0 ? i->cache->height : 0, i->cache->height > 0 ? i->cache->height : 0,
i->sx, i->sy, i->width, i->height, i->sx, i->sy, i->width, i->height,
pixel_per_char_i, pixel_per_line_i); pixel_per_char_i, pixel_per_line_i);
#endif }
char *url = ((enable_inline_image == INLINE_IMG_SIXEL || getenv("WINDOWID")) && #endif
/* XXX I don't know why but sometimes i->cache->file doesn't exist. */
i->cache->touch && stat(i->cache->file,&st) == 0) ? /*
/* local */ i->cache->file : /* remote */ i->cache->url; * So this shouldn't ever happen, but if it does then at least let's
* not have external programs fetch images from the Internet...
*/
if (!i->cache->touch || stat(i->cache->file,&st))
return;
char *url = i->cache->file;
int x = i->x / pixel_per_char_i; int x = i->x / pixel_per_char_i;
int y = i->y / pixel_per_line_i; int y = i->y / pixel_per_line_i;
@@ -474,7 +481,10 @@ loadImage(Buffer *buf, int flag)
*/ */
cache->pid = 0; cache->pid = 0;
} }
/*TODO I'm pretty sure this can be accessed again when the buffer isn't
* discarded. not sure though
unlink(cache->touch); unlink(cache->touch);
*/
image_cache[i] = NULL; image_cache[i] = NULL;
} }
@@ -547,8 +557,11 @@ loadImage(Buffer *buf, int flag)
setup_child(FALSE, 0, -1); setup_child(FALSE, 0, -1);
image_source = cache->file; image_source = cache->file;
b = loadGeneralFile(cache->url, cache->current, NULL, 0, NULL); b = loadGeneralFile(cache->url, cache->current, NULL, 0, NULL);
/* TODO this apparently messes up stuff but why? */
#if 0
if (!b || !b->real_type || strncasecmp(b->real_type, "image/", 6)) if (!b || !b->real_type || strncasecmp(b->real_type, "image/", 6))
unlink(cache->file); unlink(cache->file);
#endif
#if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT) #if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT)
symlink(cache->file, cache->touch); symlink(cache->file, cache->touch);
#else #else
rc.c
+1 -1
View File
@@ -367,7 +367,7 @@ static struct sel_c graphic_char_str[] = {
#ifdef USE_IMAGE #ifdef USE_IMAGE
static struct sel_c inlineimgstr[] = { static struct sel_c inlineimgstr[] = {
{N_S(INLINE_IMG_NONE), N_("none")}, {N_S(INLINE_IMG_NONE), N_("none")},
{N_S(INLINE_IMG_OSC5379), N_("mlterm osc 5379")}, {N_S(INLINE_IMG_OSC5379), N_("mlterm")},
{N_S(INLINE_IMG_SIXEL), N_("sixel")}, {N_S(INLINE_IMG_SIXEL), N_("sixel")},
{0, NULL, NULL} {0, NULL, NULL}
}; };