comparison src/macterm.c @ 73298:d16326a96180

(mac_draw_image_string, mac_draw_image_string_16): Add argument OVERSTRIKE_P. (mac_draw_string_common, mac_draw_image_string_cg): Likewise. Support overstrike. (mac_draw_string, mac_draw_string_16): Remove functions. (x_draw_glyph_string_foreground): Use overstrike when needed. (x_draw_composite_glyph_string_foreground): Likewise. Use mac_draw_image_string_16 instead of mac_draw_string_16. (mac_load_query_font): Rename from XLoadQueryFont. Take argument F instead of DPY. All uses changed. Don't save/restore font.

73297:f4d7960fe496

  InvertRect (&r);
}


static void
mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
     struct frame *f;
     GC gc;
     int x, y;
     char *buf;
     int nchars, bg_width, bytes_per_char;
{
  SetPortWindowPort (FRAME_MAC_WINDOW (f));

#if USE_ATSUI
  if (GC_FONT (gc)->mac_style)

	    }
	  MoveTo (x, y);
	  ATSUDrawText (text_layout,
			kATSUFromTextBeginning, kATSUToTextEnd,
			kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
	  mac_end_clip (gc);
#ifdef MAC_OSX
	}
      else
	{

	  CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
	  err = ATSUSetLayoutControls (text_layout,
				       sizeof (tags) / sizeof (tags[0]),
				       tags, sizes, values);
	  if (err == noErr)
	    ATSUDrawText (text_layout,
			  kATSUFromTextBeginning, kATSUToTextEnd,
			  Long2Fix (x), Long2Fix (port_height - y));
#if USE_CG_DRAWING
	  mac_end_cg_clip (f);
	  context = NULL;
#else
	  CGContextSynchronize (context);

      TextFont (GC_FONT (gc)->mac_fontnum);
      TextSize (GC_FONT (gc)->mac_fontsize);
      TextFace (GC_FONT (gc)->mac_fontface);
      MoveTo (x, y);
      DrawText (buf, 0, nchars * bytes_per_char);
      if (bg_width)
	RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
      mac_end_clip (gc);

#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020

#endif
    }
}


/* Mac replacement for XDrawString.  */

static void
mac_draw_string (f, gc, x, y, buf, nchars)
     struct frame *f;
     GC gc;
     int x, y;
     char *buf;
     int nchars;
{
  mac_draw_string_common (f, gc, x, y, buf, nchars, 0, 1);
}


/* Mac replacement for XDrawString16. */

static void
mac_draw_string_16 (f, gc, x, y, buf, nchars)
     struct frame *f;
     GC gc;
     int x, y;
     XChar2b *buf;
     int nchars;
{
  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, 0, 2);
}


/* Mac replacement for XDrawImageString.  */

static void
mac_draw_image_string (f, gc, x, y, buf, nchars, bg_width)
     struct frame *f;
     GC gc;
     int x, y;
     char *buf;
     int nchars, bg_width;
{
  mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, 1);
}


/* Mac replacement for XDrawString16.  */

static void
mac_draw_image_string_16 (f, gc, x, y, buf, nchars, bg_width)
     struct frame *f;
     GC gc;
     int x, y;
     XChar2b *buf;
     int nchars, bg_width;
{
  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, bg_width, 2);
}


/* Mac replacement for XQueryTextExtents, but takes a character.  If
   STYLE is NULL, measurement is done by QuickDraw Text routines for

  if (valid_p)
    cg_text_anti_aliasing_threshold = threshold;
}

static int
mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
     struct frame *f;
     GC gc;
     int x, y;
     XChar2b *buf;
     int nchars, bg_width;
{
  CGrafPtr port;
  float port_height, gx, gy;
  int i;
  CGContextRef context;

  if (GC_FONT (gc)->mac_fontsize <= cg_text_anti_aliasing_threshold)
    CGContextSetShouldAntialias (context, false);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
  CGContextSetTextPosition (context, gx, gy);
  CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
#else
  for (i = 0; i < nchars; i++)
    {
      CGContextShowGlyphsAtPoint (context, gx, gy, glyphs + i, 1);
      gx += advances[i].width;
    }
#endif
#if USE_CG_DRAWING
  mac_end_cg_clip (f);

#endif
	  )
#if USE_CG_TEXT_DRAWING
	if (!s->two_byte_p
	    && mac_draw_image_string_cg (s->f, s->gc, x, s->ybase - boff,
					 s->char2b, s->nchars, bg_width))
	  ;
	else
#endif
	  mac_draw_image_string_16 (s->f, s->gc, x, s->ybase - boff,
				    s->char2b, s->nchars, bg_width);
      else
	mac_draw_image_string (s->f, s->gc, x, s->ybase - boff,
			       char1b, s->nchars, bg_width);
    }
}

/* Draw the foreground of composite glyph string S.  */

			    s->width - 1, s->height - 1);
    }
  else
    {
      for (i = 0; i < s->nchars; i++, ++s->gidx)
	mac_draw_string_16 (s->f, s->gc,
			    x + s->cmp->offsets[s->gidx * 2],
			    s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
			    s->char2b + i, 1);
    }
}


#ifdef USE_X_TOOLKIT

  return 1;
}


/* XLoadQueryFont creates and returns an internal representation for a
   font in a MacFontStruct struct.  There is really no concept
   corresponding to "loading" a font on the Mac.  But we check its
   existence and find the font number and all other information for it
   and store them in the returned MacFontStruct.  */

static MacFontStruct *
XLoadQueryFont (Display *dpy, char *fontname)
{
  int size;
  char *name;
  Str255 family;
  Str31 charset;

	}
    }
  else
#endif
    {
      GrafPtr port;
      SInt16 old_fontnum, old_fontsize;
      Style old_fontface;
      FontInfo the_fontinfo;
      int is_two_byte_font;

#if USE_CG_DRAWING
      mac_prepare_for_quickdraw (NULL);
#endif
      /* Save the current font number used.  */
      GetPort (&port);
#if TARGET_API_MAC_CARBON
      old_fontnum = GetPortTextFont (port);
      old_fontsize = GetPortTextSize (port);
      old_fontface = GetPortTextFace (port);
#else
      old_fontnum = port->txFont;
      old_fontsize = port->txSize;
      old_fontface = port->txFace;
#endif

      TextFont (fontnum);
      TextSize (size);
      TextFace (fontface);

				  space_bounds, NULL);

	  for (c = 0x21, pcm = space_bounds + 1; c <= 0xff; c++, pcm++)
	    mac_query_char_extents (NULL, c, NULL, NULL, pcm, NULL);
	}

      /* Restore previous font number, size and face.  */
      TextFont (old_fontnum);
      TextSize (old_fontsize);
      TextFace (old_fontface);
    }

  if (space_bounds)
    {
      int c;

    int i;

    fontname = (char *) SDATA (XCAR (font_names));

    BLOCK_INPUT;
    font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
    UNBLOCK_INPUT;
    if (!font)
      return NULL;

    /* Find a free slot in the font table.  */

73298:d16326a96180

  InvertRect (&r);
}


static void
mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width,
			overstrike_p, bytes_per_char)
     struct frame *f;
     GC gc;
     int x, y;
     char *buf;
     int nchars, bg_width, overstrike_p, bytes_per_char;
{
  SetPortWindowPort (FRAME_MAC_WINDOW (f));

#if USE_ATSUI
  if (GC_FONT (gc)->mac_style)

	    }
	  MoveTo (x, y);
	  ATSUDrawText (text_layout,
			kATSUFromTextBeginning, kATSUToTextEnd,
			kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
	  if (overstrike_p)
	    {
	      MoveTo (x + 1, y);
	      ATSUDrawText (text_layout,
			    kATSUFromTextBeginning, kATSUToTextEnd,
			    kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
	    }
	  mac_end_clip (gc);
#ifdef MAC_OSX
	}
      else
	{

	  CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
	  err = ATSUSetLayoutControls (text_layout,
				       sizeof (tags) / sizeof (tags[0]),
				       tags, sizes, values);
	  if (err == noErr)
	    {
	      ATSUDrawText (text_layout,
			    kATSUFromTextBeginning, kATSUToTextEnd,
			    Long2Fix (x), Long2Fix (port_height - y));
	      if (overstrike_p)
		ATSUDrawText (text_layout,
			      kATSUFromTextBeginning, kATSUToTextEnd,
			      Long2Fix (x + 1), Long2Fix (port_height - y));
	    }
#if USE_CG_DRAWING
	  mac_end_cg_clip (f);
	  context = NULL;
#else
	  CGContextSynchronize (context);

      TextFont (GC_FONT (gc)->mac_fontnum);
      TextSize (GC_FONT (gc)->mac_fontsize);
      TextFace (GC_FONT (gc)->mac_fontface);
      MoveTo (x, y);
      DrawText (buf, 0, nchars * bytes_per_char);
      if (overstrike_p)
	{
	  TextMode (srcOr);
	  MoveTo (x + 1, y);
	  DrawText (buf, 0, nchars * bytes_per_char);
	}
      if (bg_width)
	RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
      mac_end_clip (gc);

#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020

#endif
    }
}


/* Mac replacement for XDrawImageString.  */

static void
mac_draw_image_string (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
     struct frame *f;
     GC gc;
     int x, y;
     char *buf;
     int nchars, bg_width, overstrike_p;
{
  mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width,
			  overstrike_p, 1);
}


/* Mac replacement for XDrawImageString16.  */

static void
mac_draw_image_string_16 (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
     struct frame *f;
     GC gc;
     int x, y;
     XChar2b *buf;
     int nchars, bg_width, overstrike_p;
{
  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, bg_width,
			  overstrike_p, 2);
}


/* Mac replacement for XQueryTextExtents, but takes a character.  If
   STYLE is NULL, measurement is done by QuickDraw Text routines for

  if (valid_p)
    cg_text_anti_aliasing_threshold = threshold;
}

static int
mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
     struct frame *f;
     GC gc;
     int x, y;
     XChar2b *buf;
     int nchars, bg_width, overstrike_p;
{
  CGrafPtr port;
  float port_height, gx, gy;
  int i;
  CGContextRef context;

  if (GC_FONT (gc)->mac_fontsize <= cg_text_anti_aliasing_threshold)
    CGContextSetShouldAntialias (context, false);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
  CGContextSetTextPosition (context, gx, gy);
  CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
  if (overstrike_p)
    {
      CGContextSetTextPosition (context, gx + 1.0f, gy);
      CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
    }
#else
  for (i = 0; i < nchars; i++)
    {
      CGContextShowGlyphsAtPoint (context, gx, gy, glyphs + i, 1);
      if (overstrike_p)
	CGContextShowGlyphsAtPoint (context, gx + 1.0f, gy, glyphs + i, 1);
      gx += advances[i].width;
    }
#endif
#if USE_CG_DRAWING
  mac_end_cg_clip (f);

#endif
	  )
#if USE_CG_TEXT_DRAWING
	if (!s->two_byte_p
	    && mac_draw_image_string_cg (s->f, s->gc, x, s->ybase - boff,
					 s->char2b, s->nchars, bg_width,
					 s->face->overstrike))
	  ;
	else
#endif
	  mac_draw_image_string_16 (s->f, s->gc, x, s->ybase - boff,
				    s->char2b, s->nchars, bg_width,
				    s->face->overstrike);
      else
	mac_draw_image_string (s->f, s->gc, x, s->ybase - boff,
			       char1b, s->nchars, bg_width,
			       s->face->overstrike);
    }
}

/* Draw the foreground of composite glyph string S.  */

			    s->width - 1, s->height - 1);
    }
  else
    {
      for (i = 0; i < s->nchars; i++, ++s->gidx)
	mac_draw_image_string_16 (s->f, s->gc,
				  x + s->cmp->offsets[s->gidx * 2],
				  s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
				  s->char2b + i, 1, 0, s->face->overstrike);
    }
}


#ifdef USE_X_TOOLKIT

  return 1;
}


/* mac_load_query_font creates and returns an internal representation
   for a font in a MacFontStruct struct.  There is really no concept
   corresponding to "loading" a font on the Mac.  But we check its
   existence and find the font number and all other information for it
   and store them in the returned MacFontStruct.  */

static MacFontStruct *
mac_load_query_font (f, fontname)
     struct frame *f;
     char *fontname;
{
  int size;
  char *name;
  Str255 family;
  Str31 charset;

	}
    }
  else
#endif
    {
      FontInfo the_fontinfo;
      int is_two_byte_font;

#if USE_CG_DRAWING
      mac_prepare_for_quickdraw (f);
#endif
      SetPortWindowPort (FRAME_MAC_WINDOW (f));

      TextFont (fontnum);
      TextSize (size);
      TextFace (fontface);

				  space_bounds, NULL);

	  for (c = 0x21, pcm = space_bounds + 1; c <= 0xff; c++, pcm++)
	    mac_query_char_extents (NULL, c, NULL, NULL, pcm, NULL);
	}
    }

  if (space_bounds)
    {
      int c;

    int i;

    fontname = (char *) SDATA (XCAR (font_names));

    BLOCK_INPUT;
    font = mac_load_query_font (f, fontname);
    UNBLOCK_INPUT;
    if (!font)
      return NULL;

    /* Find a free slot in the font table.  */