comparison src/macterm.c @ 83490:0cdee8b991e1

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-144 Update from CVS * [e-mail]/emacs--devo--0--patch-145 Update from CVS * [e-mail]/emacs--devo--0--patch-146 Update from CVS * [e-mail]/emacs--devo--0--patch-147 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-148 Update from CVS * [e-mail]/emacs--devo--0--patch-149 Update from CVS * [e-mail]/emacs--devo--0--patch-150 Update from CVS * [e-mail]/emacs--devo--0--patch-151 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-152 Update from CVS * [e-mail]/gnus--rel--5.10--patch-56 Update from CVS * [e-mail]/gnus--rel--5.10--patch-57 Copy/update icons from Gnus trunk git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-530

83489:1e2c51896896

  Rect r;

  SetPortWindowPort (FRAME_MAC_WINDOW (f));

  RGBForeColor (GC_FORE_COLOR (gc));
  SetRect (&r, x, y, x + width + 1, y + height + 1);

  mac_begin_clip (gc);
  FrameRect (&r); /* using foreground color of gc */
  mac_end_clip (gc);
}

    {
      for (i = 0; i < s->nchars; ++i)
	{
	  struct glyph *g = s->first_glyph + i;
	  mac_draw_rectangle (s->f, s->gc, x, s->y,
			      g->pixel_width - 1, s->height - 1);
	  x += g->pixel_width;
	}
    }
  else
    {

     first character of the composition could not be loaded.  */
  if (s->font_not_found_p)
    {
      if (s->gidx == 0)
	mac_draw_rectangle (s->f, s->gc, x, s->y,
			    s->width - 1, s->height - 1);
    }
  else
    {
      for (i = 0; i < s->nchars; i++, ++s->gidx)
	mac_draw_string_16 (s->f, s->gc,

	  if (s->hl == DRAW_CURSOR)
	    {
	      int r = s->img->relief;
	      if (r < 0) r = -r;
	      mac_draw_rectangle (s->f, s->gc, x - r, y - r,
				  s->slice.width + r*2 - 1,
				  s->slice.height + r*2 - 1);
	    }
	}
    }
  else
    /* Draw a rectangle if image could not be loaded.  */
    mac_draw_rectangle (s->f, s->gc, x, y,
			s->slice.width - 1, s->slice.height - 1);
}


/* Draw a relief around the image glyph string S.  */

    return;

  /* Compute frame-relative coordinates for phys cursor.  */
  x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
  wd = w->phys_cursor_width;

  /* The foreground of cursor_gc is typically the same as the normal
     background color, which can cause the cursor box to be invisible.  */
  xgcv.foreground = f->output_data.mac->cursor_pixel;
  if (dpyinfo->scratch_cursor_gc)

83490:0cdee8b991e1

  Rect r;

  SetPortWindowPort (FRAME_MAC_WINDOW (f));

  RGBForeColor (GC_FORE_COLOR (gc));
  SetRect (&r, x, y, x + width, y + height);

  mac_begin_clip (gc);
  FrameRect (&r); /* using foreground color of gc */
  mac_end_clip (gc);
}

    {
      for (i = 0; i < s->nchars; ++i)
	{
	  struct glyph *g = s->first_glyph + i;
	  mac_draw_rectangle (s->f, s->gc, x, s->y,
			      g->pixel_width, s->height);
	  x += g->pixel_width;
	}
    }
  else
    {

     first character of the composition could not be loaded.  */
  if (s->font_not_found_p)
    {
      if (s->gidx == 0)
	mac_draw_rectangle (s->f, s->gc, x, s->y,
			    s->width, s->height);
    }
  else
    {
      for (i = 0; i < s->nchars; i++, ++s->gidx)
	mac_draw_string_16 (s->f, s->gc,

	  if (s->hl == DRAW_CURSOR)
	    {
	      int r = s->img->relief;
	      if (r < 0) r = -r;
	      mac_draw_rectangle (s->f, s->gc, x - r, y - r,
				  s->slice.width + r*2,
				  s->slice.height + r*2);
	    }
	}
    }
  else
    /* Draw a rectangle if image could not be loaded.  */
    mac_draw_rectangle (s->f, s->gc, x, y,
			s->slice.width, s->slice.height);
}


/* Draw a relief around the image glyph string S.  */

    return;

  /* Compute frame-relative coordinates for phys cursor.  */
  x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
  wd = w->phys_cursor_width + 1;

  /* The foreground of cursor_gc is typically the same as the normal
     background color, which can cause the cursor box to be invisible.  */
  xgcv.foreground = f->output_data.mac->cursor_pixel;
  if (dpyinfo->scratch_cursor_gc)