[Emacs-commit] emacs/src xterm.h xterm.c xfns.c xfaces.c xdisp...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/22 17:42:10

Modified files:
        src            : xterm.h xterm.c xfns.c xfaces.c xdisp.c 
                         w32term.h w32term.c w32fns.c termhooks.h 
                         macterm.h macterm.c macfns.c image.c frame.h 
                         dispextern.h alloc.c ChangeLog 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.h?cvsroot=emacs&r1=1.202&r2=1.203
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.977&r2=1.978
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.705&r2=1.706
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.377&r2=1.378
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1187&r2=1.1188
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.h?cvsroot=emacs&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.c?cvsroot=emacs&r1=1.281&r2=1.282
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32fns.c?cvsroot=emacs&r1=1.312&r2=1.313
http://cvs.savannah.gnu.org/viewcvs/emacs/src/termhooks.h?cvsroot=emacs&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/emacs/src/macterm.h?cvsroot=emacs&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/emacs/src/macterm.c?cvsroot=emacs&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/emacs/src/macfns.c?cvsroot=emacs&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/emacs/src/image.c?cvsroot=emacs&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.h?cvsroot=emacs&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dispextern.h?cvsroot=emacs&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/emacs/src/alloc.c?cvsroot=emacs&r1=1.436&r2=1.437
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.6181&r2=1.6182