Mercurial > emacs
comparison src/xterm.h @ 92109:4d9fc08769fa
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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Feb 2008 17:42:09 +0000 |
| parents | 8dadab0712f6 |
| children | 3c91cba34532 |
comparison
equal
deleted
inserted
replaced
| 92108:fc5344b71cdb | 92109:4d9fc08769fa |
|---|---|
| 327 background color of a gc. */ | 327 background color of a gc. */ |
| 328 Pixmap null_pixel; | 328 Pixmap null_pixel; |
| 329 | 329 |
| 330 /* The gray pixmap. */ | 330 /* The gray pixmap. */ |
| 331 Pixmap gray; | 331 Pixmap gray; |
| 332 | |
| 333 /* Cache of images. */ | |
| 334 struct image_cache *image_cache; | |
| 335 | 332 |
| 336 #ifdef HAVE_X_I18N | 333 #ifdef HAVE_X_I18N |
| 337 /* XIM (X Input method). */ | 334 /* XIM (X Input method). */ |
| 338 XIM xim; | 335 XIM xim; |
| 339 XIMStyles *xim_styles; | 336 XIMStyles *xim_styles; |
| 735 | 732 |
| 736 /* Value is the smallest height of any font on frame F. */ | 733 /* Value is the smallest height of any font on frame F. */ |
| 737 | 734 |
| 738 #define FRAME_SMALLEST_FONT_HEIGHT(F) \ | 735 #define FRAME_SMALLEST_FONT_HEIGHT(F) \ |
| 739 FRAME_X_DISPLAY_INFO(F)->smallest_font_height | 736 FRAME_X_DISPLAY_INFO(F)->smallest_font_height |
| 740 | |
| 741 /* Return a pointer to the image cache of frame F. */ | |
| 742 | |
| 743 #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache | |
| 744 | |
| 745 | 737 |
| 746 /* X-specific scroll bar stuff. */ | 738 /* X-specific scroll bar stuff. */ |
| 747 | 739 |
| 748 /* We represent scroll bars as lisp vectors. This allows us to place | 740 /* We represent scroll bars as lisp vectors. This allows us to place |
| 749 references to them in windows without worrying about whether we'll | 741 references to them in windows without worrying about whether we'll |