Consolidate the image_cache to the terminal struct.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Feb 2008 17:42:09 +0000 (17:42 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Feb 2008 17:42:09 +0000 (17:42 +0000)
commit354884c46ee708a22b0372d2092256408b485c8d
tree03802c0c4e44d3ecd4b096cada74b8abf811ce29
parentc2e426903cfd93202e302471a6e1b265a08e8368
Consolidate the image_cache to the terminal struct.
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro.  Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove.  Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
17 files changed:
src/ChangeLog
src/alloc.c
src/dispextern.h
src/frame.h
src/image.c
src/macfns.c
src/macterm.c
src/macterm.h
src/termhooks.h
src/w32fns.c
src/w32term.c
src/w32term.h
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xterm.c
src/xterm.h