diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-06-20 17:03:36 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-06-20 17:03:36 +0800 |
| commit | cebca072c33937b84995a62c35c16441d23bb86d (patch) | |
| tree | e1bf28f6453a63a4d0eafa4757e4f65230e2338f /src/termhooks.h | |
| parent | 374f4235d5e78def23d92b05f3d0257c1f609725 (diff) | |
Correctly cache images when frames vary in their font metrics
* src/alloc.c (mark_frame): Mark this frame's image cache, if it
exist.
(mark_terminals): Cease marking T->image_cache.
* src/androidfns.c (unwind_create_frame, Fx_create_frame)
(android_create_tip_frame):
* src/haikufns.c (unwind_create_frame, haiku_create_frame)
(haiku_create_tip_frame):
* src/nsfns.m (unwind_create_frame):
* src/pgtkfns.c (unwind_create_frame, Fx_create_frame)
(x_create_tip_frame):
* src/xfns.c (unwind_create_frame, Fx_create_frame)
(x_create_tip_frame):
* src/w32fns.c (unwind_create_frame, Fx_create_frame)
(w32_create_tip_frame): Remove adjustments of the frame image
cache's reference count rendered redundant by the assignment of
image caches to individual frames rather than terminals.
* src/dispextern.h (struct image_cache) <scaling_col_width>: New
field.
* src/frame.c (gui_set_font): In lieu of clearing F's image
cache unconditionally, establish whether the column width as
considered by compute_image_size has changed, and if so, adjust
or reassign the frame's image cache.
(make_frame): Clear F->image_cache.
* src/frame.h (struct frame) <image_cache>: New field.
(FRAME_IMAGE_CACHE): Return F->image_cache.
* src/image.c (make_image_cache): Clear C->scaling_col_width.
(cache_image): Adjust to new means of assigning image caches to
frames.
* src/termhooks.h (struct terminal) <image_cache>: Delete field.
* src/xfaces.c (init_frame_faces): Do image cache assignment
with all new frames.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index d828c62ce33..d6a9300bac9 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -523,11 +523,6 @@ struct terminal /* The terminal's keyboard object. */ struct kboard *kboard; -#ifdef HAVE_WINDOW_SYSTEM - /* Cache of images. */ - struct image_cache *image_cache; -#endif /* HAVE_WINDOW_SYSTEM */ - /* Device-type dependent data shared amongst all frames on this terminal. */ union display_info { |