[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macterm.h
From: |
Steven Tamm |
Subject: |
[Emacs-diffs] Changes to emacs/src/macterm.h |
Date: |
Mon, 27 Dec 2004 12:42:35 -0500 |
Index: emacs/src/macterm.h
diff -c emacs/src/macterm.h:1.15 emacs/src/macterm.h:1.16
*** emacs/src/macterm.h:1.15 Fri Dec 3 17:00:11 2004
--- emacs/src/macterm.h Mon Dec 27 17:27:30 2004
***************
*** 218,223 ****
--- 218,226 ----
struct image_cache *image_cache;
};
+ /* This checks to make sure we have a display. */
+ extern void check_mac P_ ((void));
+
#define x_display_info mac_display_info
/* This is a chain of structures for all the X displays currently in use. */
***************
*** 388,393 ****
--- 391,399 ----
/* The background for which the above relief GCs were set up.
They are changed only when a different background is involved. */
unsigned long relief_background;
+
+ /* Hints for the size and the position of a window. */
+ XSizeHints *size_hints;
};
typedef struct mac_output mac_output;
***************
*** 407,412 ****
--- 413,420 ----
#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.mac->baseline_offset)
+ #define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints)
+
/* This gives the w32_display_info structure for the display F is on. */
#define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
#define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
***************
*** 596,601 ****
--- 604,610 ----
extern void XSetForeground P_ ((Display *, GC, unsigned long));
extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int,
int, int));
+ extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
#define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0