From 483e7ae0fa870b9e167236af9379203101dad55e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 21 May 2007 23:03:49 +0000 Subject: [PATCH] (uncache_image): New function. (Fimage_refresh): New function. --- src/image.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/image.c b/src/image.c index 12b27fe359..6858675d9e 100644 --- a/src/image.c +++ b/src/image.c @@ -1631,6 +1631,27 @@ make_image_cache () } +/* Search frame F for an images with spec SPEC, and free it. */ + +static void +uncache_image (f, spec) + struct frame *f; + Lisp_Object spec; +{ + struct image_cache *c = FRAME_X_IMAGE_CACHE (f); + struct image *img = IMAGE_FROM_ID (f, lookup_image (f, spec)); + unsigned hash = sxhash (spec, 0); + int i = hash % IMAGE_CACHE_BUCKETS_SIZE; + + for (img = c->buckets[i]; img; img = img->next) + if (img->hash == hash && !NILP (Fequal (img->spec, spec))) + { + free_image (f, img); + break; + } +} + + /* Free image cache of frame F. Be aware that X frames share images caches. */ @@ -1741,6 +1762,36 @@ FRAME t means clear the image caches of all frames. */) } +DEFUN ("image-refresh", Fimage_refresh, Simage_refresh, + 1, 2, 0, + doc: /* Refresh the image with specification SPEC on frame FRAME. +If SPEC specifies an image file, the displayed image is updated with +the current contents of that file. +FRAME nil or omitted means use the selected frame. +FRAME t means refresh the image on all frames. */) + (spec, frame) + Lisp_Object spec, frame; +{ + if (!valid_image_p (spec)) + error ("Invalid image specification"); + + if (EQ (frame, Qt)) + { + Lisp_Object tail; + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + if (FRAME_WINDOW_P (f)) + uncache_image (f, spec); + } + } + else + uncache_image (check_x_frame (frame), spec); + + return Qnil; +} + + /* Compute masks and transform image IMG on frame F, as specified by the image's specification, */ @@ -8660,6 +8711,7 @@ non-numeric, there is no explicit limit on the size of images. */); defsubr (&Sinit_image_library); defsubr (&Sclear_image_cache); + defsubr (&Simage_refresh); defsubr (&Simage_size); defsubr (&Simage_mask_p); defsubr (&Simage_extension_data); -- 2.20.1