Mercurial > emacs
comparison src/macterm.h @ 83553:32073cbc5eb6
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-592
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-593
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-594
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-595
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-596
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-597
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-598
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-186
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-187
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-188
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-189
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-190
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-191
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-593
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 13 Jan 2007 22:59:28 +0000 |
parents | d3099204c799 17977cca87a6 |
children | b8d9a391daf3 |
comparison
equal
deleted
inserted
replaced
83552:d3099204c799 | 83553:32073cbc5eb6 |
---|---|
41 | 41 |
42 #define FONT_WIDTH(f) ((f)->max_bounds.width) | 42 #define FONT_WIDTH(f) ((f)->max_bounds.width) |
43 #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) | 43 #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) |
44 #define FONT_BASE(f) ((f)->ascent) | 44 #define FONT_BASE(f) ((f)->ascent) |
45 #define FONT_DESCENT(f) ((f)->descent) | 45 #define FONT_DESCENT(f) ((f)->descent) |
46 | |
47 #define FONT_MAX_WIDTH(f) FONT_WIDTH(f) /* fix later */ | |
48 | 46 |
49 /* Structure recording bitmaps and reference count. | 47 /* Structure recording bitmaps and reference count. |
50 If REFCOUNT is 0 then this record is free to be reused. */ | 48 If REFCOUNT is 0 then this record is free to be reused. */ |
51 | 49 |
52 struct mac_bitmap_record | 50 struct mac_bitmap_record |
612 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, | 610 extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, |
613 unsigned int, unsigned int, | 611 unsigned int, unsigned int, |
614 unsigned long, unsigned long, | 612 unsigned long, unsigned long, |
615 unsigned int)); | 613 unsigned int)); |
616 extern void XFreePixmap P_ ((Display *, Pixmap)); | 614 extern void XFreePixmap P_ ((Display *, Pixmap)); |
617 extern GC XCreateGC P_ ((Display *, Window, unsigned long, XGCValues *)); | 615 extern GC XCreateGC P_ ((Display *, void *, unsigned long, XGCValues *)); |
618 extern void XFreeGC P_ ((Display *, GC)); | 616 extern void XFreeGC P_ ((Display *, GC)); |
619 extern void XSetForeground P_ ((Display *, GC, unsigned long)); | 617 extern void XSetForeground P_ ((Display *, GC, unsigned long)); |
620 extern void XSetBackground P_ ((Display *, GC, unsigned long)); | 618 extern void XSetBackground P_ ((Display *, GC, unsigned long)); |
621 extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long)); | 619 extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long)); |
622 extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int, | 620 extern void XDrawLine P_ ((Display *, Pixmap, GC, int, int, int, int)); |
623 int, int)); | |
624 extern void mac_clear_area P_ ((struct frame *, int, int, | 621 extern void mac_clear_area P_ ((struct frame *, int, int, |
625 unsigned int, unsigned int)); | 622 unsigned int, unsigned int)); |
626 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); | 623 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); |
627 extern int mac_font_panel_visible_p P_ ((void)); | 624 extern int mac_font_panel_visible_p P_ ((void)); |
628 extern OSStatus mac_show_hide_font_panel P_ ((void)); | 625 extern OSStatus mac_show_hide_font_panel P_ ((void)); |
633 #if !TARGET_API_MAC_CARBON | 630 #if !TARGET_API_MAC_CARBON |
634 extern void do_apple_menu P_ ((SInt16)); | 631 extern void do_apple_menu P_ ((SInt16)); |
635 #endif | 632 #endif |
636 #if USE_CG_DRAWING | 633 #if USE_CG_DRAWING |
637 extern void mac_prepare_for_quickdraw P_ ((struct frame *)); | 634 extern void mac_prepare_for_quickdraw P_ ((struct frame *)); |
635 #endif | |
636 #ifdef MAC_OSX | |
637 extern int mac_quit_char_key_p P_ ((UInt32, UInt32)); | |
638 #endif | 638 #endif |
639 | 639 |
640 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 | 640 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 |
641 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 | 641 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 |
642 | 642 |