Mercurial > emacs
comparison src/macterm.c @ 83248:86457de2420c
Merged from miles@gnu.org--gnu-2005 (patch 76-78)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 04 Feb 2005 15:36:07 +0000 |
parents | 3dcba0bc766b 96a18b943293 |
children | 1f334cdd7020 |
comparison
equal
deleted
inserted
replaced
83247:a257c9edb57b | 83248:86457de2420c |
---|---|
727 int x, y; | 727 int x, y; |
728 char *buf; | 728 char *buf; |
729 int nchars, mode, bytes_per_char; | 729 int nchars, mode, bytes_per_char; |
730 { | 730 { |
731 SetPortWindowPort (w); | 731 SetPortWindowPort (w); |
732 #ifdef MAC_OS_X_VERSION_10_2 | 732 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 |
733 UInt32 textFlags, savedFlags; | 733 UInt32 textFlags, savedFlags; |
734 if (!NILP(Vmac_use_core_graphics)) { | 734 if (!NILP(Vmac_use_core_graphics)) { |
735 textFlags = kQDUseCGTextRendering; | 735 textFlags = kQDUseCGTextRendering; |
736 savedFlags = SwapQDTextFlags(textFlags); | 736 savedFlags = SwapQDTextFlags(textFlags); |
737 } | 737 } |
744 TextFace (gc->font->mac_fontface); | 744 TextFace (gc->font->mac_fontface); |
745 TextMode (mode); | 745 TextMode (mode); |
746 | 746 |
747 MoveTo (x, y); | 747 MoveTo (x, y); |
748 DrawText (buf, 0, nchars * bytes_per_char); | 748 DrawText (buf, 0, nchars * bytes_per_char); |
749 #ifdef MAC_OS_X_VERSION_10_2 | 749 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 |
750 if (!NILP(Vmac_use_core_graphics)) | 750 if (!NILP(Vmac_use_core_graphics)) |
751 SwapQDTextFlags(savedFlags); | 751 SwapQDTextFlags(savedFlags); |
752 #endif | 752 #endif |
753 } | 753 } |
754 | 754 |
5449 RepositionWindow (FRAME_MAC_WINDOW (f), NULL, | 5449 RepositionWindow (FRAME_MAC_WINDOW (f), NULL, |
5450 kWindowCenterOnMainScreen); | 5450 kWindowCenterOnMainScreen); |
5451 else | 5451 else |
5452 RepositionWindow (FRAME_MAC_WINDOW (f), | 5452 RepositionWindow (FRAME_MAC_WINDOW (f), |
5453 FRAME_MAC_WINDOW (sf), | 5453 FRAME_MAC_WINDOW (sf), |
5454 #ifdef MAC_OS_X_VERSION_10_2 | 5454 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 |
5455 kWindowCascadeStartAtParentWindowScreen | 5455 kWindowCascadeStartAtParentWindowScreen |
5456 #else | 5456 #else |
5457 kWindowCascadeOnParentWindowScreen | 5457 kWindowCascadeOnParentWindowScreen |
5458 #endif | 5458 #endif |
5459 ); | 5459 ); |