comparison src/w32term.c @ 38807:a59ac9807c9d

Draw relief (if any) before drawing glyph string.

38806:45b12f1bd5fe

static void
x_draw_glyph_string (s)
     struct glyph_string *s;
{
  /* If S draws into the background of its successor, draw the
     background of the successor first so that S can draw into it.
     This makes S->next use XDrawString instead of XDrawImageString.  */
  if (s->next && s->right_overhang && !s->for_overlaps_p)
    {

    }

  /* Set up S->gc, set clipping and draw S.  */
  x_set_glyph_string_gc (s);
  x_set_glyph_string_clipping (s);

  switch (s->first_glyph->type)
    {
    case IMAGE_GLYPH:
      x_draw_image_glyph_string (s);

                             s->y + dy, s->width, h);
            }
        }

      /* Draw relief.  */
      if (s->face->box != FACE_NO_BOX)
        x_draw_glyph_string_box (s);
    }

  /* Reset clipping.  */
  w32_set_clip_rectangle (s->hdc, NULL);

38807:a59ac9807c9d

static void
x_draw_glyph_string (s)
     struct glyph_string *s;
{
  int relief_drawn_p = 0;

  /* If S draws into the background of its successor, draw the
     background of the successor first so that S can draw into it.
     This makes S->next use XDrawString instead of XDrawImageString.  */
  if (s->next && s->right_overhang && !s->for_overlaps_p)
    {

    }

  /* Set up S->gc, set clipping and draw S.  */
  x_set_glyph_string_gc (s);
  x_set_glyph_string_clipping (s);

  /* Draw relief (if any) in advance for char/composition so that the
     glyph string can be drawn over it.  */
  if (!s->for_overlaps_p
      && s->face->box != FACE_NO_BOX
      && (s->first_glyph->type == CHAR_GLYPH
	  || s->first_glyph->type == COMPOSITE_GLYPH))

    {
      x_draw_glyph_string_background (s, 1);
      x_draw_glyph_string_box (s);
      relief_drawn_p = 1;
    }

  switch (s->first_glyph->type)
    {
    case IMAGE_GLYPH:
      x_draw_image_glyph_string (s);

                             s->y + dy, s->width, h);
            }
        }

      /* Draw relief.  */
      if (!relief_drawn_p && s->face->box != FACE_NO_BOX)
        x_draw_glyph_string_box (s);
    }

  /* Reset clipping.  */
  w32_set_clip_rectangle (s->hdc, NULL);