Merge from emacs--rel--22

[gnu-emacs] / src / macterm.h

diff --git a/src/macterm.h b/src/macterm.h
index f263db811674e132737d1220e67b3ef6acd8f8b5..00b01e452dab73669ba564059a1664e8369fb166 100644 (file)
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -66,6 +66,9 @@ struct mac_display_info
   /* Chain of all mac_display_info structures.  */
   struct mac_display_info *next;
 
+  /* The generic display parameters corresponding to this X display. */
+  struct terminal *terminal;
+
   /* This is a cons cell of the form (NAME . FONT-LIST-CACHE).
      The same cons cell also appears in x_display_name_list.  */
   Lisp_Object name_list_element;
@@ -184,9 +187,6 @@ struct mac_display_info
      frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
   struct frame *x_highlight_frame;
-
-  /* Cache of images.  */
-  struct image_cache *image_cache;
 };
 
 /* This checks to make sure we have a display.  */
@@ -360,9 +360,6 @@ typedef struct mac_output mac_output;
 #define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->window_desc)
 #define FRAME_X_WINDOW(f) ((f)->output_data.mac->window_desc)
 
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
-
 #define FRAME_FONT(f) ((f)->output_data.mac->font)
 #define FRAME_FONTSET(f) ((f)->output_data.mac->fontset)
 
@@ -390,11 +387,6 @@ typedef struct mac_output mac_output;
 
 #define FRAME_SMALLEST_FONT_HEIGHT(F) \
      FRAME_MAC_DISPLAY_INFO(F)->smallest_font_height
-
-/* Return a pointer to the image cache of frame F.  */
-
-#define FRAME_X_IMAGE_CACHE(F) FRAME_MAC_DISPLAY_INFO ((F))->image_cache
-
 \f
 /* Mac-specific scroll bar stuff.  */
 
@@ -670,8 +662,6 @@ EXFUN (Fx_selection_owner_p, 1);
 
 /* Defined in macfns.c */
 
-extern int have_menus_p P_ ((void));
-
 extern void x_real_positions P_ ((struct frame *, int *, int *));
 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 extern int x_pixel_width P_ ((struct frame *));