Mercurial > emacs
comparison src/macterm.h @ 90070:95879cc1ed20
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-753
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-755
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 02 Jan 2005 09:13:19 +0000 |
parents | f2ebccfa87d4 9bde7721ad0f |
children | cb67264d6096 |
comparison
equal
deleted
inserted
replaced
90069:fa0a5c4db2c8 | 90070:95879cc1ed20 |
---|---|
216 | 216 |
217 /* Cache of images. */ | 217 /* Cache of images. */ |
218 struct image_cache *image_cache; | 218 struct image_cache *image_cache; |
219 }; | 219 }; |
220 | 220 |
221 /* This checks to make sure we have a display. */ | |
222 extern void check_mac P_ ((void)); | |
223 | |
221 #define x_display_info mac_display_info | 224 #define x_display_info mac_display_info |
222 | 225 |
223 /* This is a chain of structures for all the X displays currently in use. */ | 226 /* This is a chain of structures for all the X displays currently in use. */ |
224 extern struct x_display_info *x_display_list; | 227 extern struct x_display_info *x_display_list; |
225 | 228 |
386 black_relief, white_relief; | 389 black_relief, white_relief; |
387 | 390 |
388 /* The background for which the above relief GCs were set up. | 391 /* The background for which the above relief GCs were set up. |
389 They are changed only when a different background is involved. */ | 392 They are changed only when a different background is involved. */ |
390 unsigned long relief_background; | 393 unsigned long relief_background; |
394 | |
395 /* Hints for the size and the position of a window. */ | |
396 XSizeHints *size_hints; | |
391 }; | 397 }; |
392 | 398 |
393 typedef struct mac_output mac_output; | 399 typedef struct mac_output mac_output; |
394 | 400 |
395 /* Return the X output data for frame F. */ | 401 /* Return the X output data for frame F. */ |
404 | 410 |
405 #define FRAME_FONT(f) ((f)->output_data.mac->font) | 411 #define FRAME_FONT(f) ((f)->output_data.mac->font) |
406 #define FRAME_FONTSET(f) ((f)->output_data.mac->fontset) | 412 #define FRAME_FONTSET(f) ((f)->output_data.mac->fontset) |
407 | 413 |
408 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.mac->baseline_offset) | 414 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.mac->baseline_offset) |
415 | |
416 #define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints) | |
409 | 417 |
410 /* This gives the w32_display_info structure for the display F is on. */ | 418 /* This gives the w32_display_info structure for the display F is on. */ |
411 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info) | 419 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info) |
412 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info) | 420 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info) |
413 | 421 |
594 unsigned int)); | 602 unsigned int)); |
595 extern void XFreePixmap P_ ((Display *, Pixmap)); | 603 extern void XFreePixmap P_ ((Display *, Pixmap)); |
596 extern void XSetForeground P_ ((Display *, GC, unsigned long)); | 604 extern void XSetForeground P_ ((Display *, GC, unsigned long)); |
597 extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int, | 605 extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int, |
598 int, int)); | 606 int, int)); |
607 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); | |
599 | 608 |
600 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 | 609 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 |
601 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 | 610 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 |
602 | 611 |
603 #if TARGET_API_MAC_CARBON | 612 #if TARGET_API_MAC_CARBON |