Mercurial > emacs
changeset 69512:eafd737138ea
(XCreatePixmap) [!WORDS_BIG_ENDIAN && USE_CG_DRAWING]:
Create GWorld in ARGB pixel format.
(mac_copy_area, mac_copy_area_with_mask) [USE_CG_DRAWING]: Remove
functions.
(x_draw_image_foreground) [USE_CG_DRAWING]: Use mac_draw_cg_image
instead of mac_copy_area/mac_copy_area_with_mask.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Thu, 16 Mar 2006 08:05:56 +0000 |
| parents | 65b669e90ff5 |
| children | 5793d5bfdf38 |
| files | src/macterm.c |
| diffstat | 1 files changed, 22 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macterm.c Thu Mar 16 08:05:34 2006 +0000 +++ b/src/macterm.c Thu Mar 16 08:05:56 2006 +0000 @@ -653,7 +653,15 @@ SetPortWindowPort (w); SetRect (&r, 0, 0, width, height); - err = NewGWorld (&pixmap, depth, &r, NULL, NULL, 0); +#if !defined (WORDS_BIG_ENDIAN) && USE_CG_DRAWING + if (depth == 1) +#endif + err = NewGWorld (&pixmap, depth, &r, NULL, NULL, 0); +#if !defined (WORDS_BIG_ENDIAN) && USE_CG_DRAWING + else + /* CreateCGImageFromPixMaps requires ARGB format. */ + err = QTNewGWorld (&pixmap, k32ARGBPixelFormat, &r, NULL, NULL, 0); +#endif if (err != noErr) return NULL; return pixmap; @@ -1336,6 +1344,7 @@ #endif +#if !USE_CG_DRAWING /* Mac replacement for XCopyArea: dest must be window. */ static void @@ -1349,9 +1358,6 @@ { Rect src_r, dest_r; -#if USE_CG_DRAWING - mac_prepare_for_quickdraw (f); -#endif SetPortWindowPort (FRAME_MAC_WINDOW (f)); SetRect (&src_r, src_x, src_y, src_x + width, src_y + height); @@ -1396,9 +1402,6 @@ { Rect src_r, dest_r; -#if USE_CG_DRAWING - mac_prepare_for_quickdraw (f); -#endif SetPortWindowPort (FRAME_MAC_WINDOW (f)); SetRect (&src_r, src_x, src_y, src_x + width, src_y + height); @@ -1431,6 +1434,7 @@ RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f))); } +#endif /* !USE_CG_DRAWING */ /* Mac replacement for XCopyArea: used only for scrolling. */ @@ -3285,15 +3289,26 @@ { x_set_glyph_string_clipping (s); +#if USE_CG_DRAWING + mac_draw_cg_image (s->img->data.ptr_val, + s->f, s->gc, s->slice.x, s->slice.y, + s->slice.width, s->slice.height, x, y, 1); +#endif if (s->img->mask) +#if !USE_CG_DRAWING mac_copy_area_with_mask (s->img->pixmap, s->img->mask, s->f, s->gc, s->slice.x, s->slice.y, s->slice.width, s->slice.height, x, y); +#else + ; +#endif else { +#if !USE_CG_DRAWING mac_copy_area (s->img->pixmap, s->f, s->gc, s->slice.x, s->slice.y, s->slice.width, s->slice.height, x, y); +#endif /* When the image has a mask, we can expect that at least part of a mouse highlight or a block cursor will