[Emacs-diffs] Changes to emacs/src/xterm.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.876 emacs/src/xterm.c:1.877
*** emacs/src/xterm.c:1.876     Fri Sep 30 22:38:13 2005
--- emacs/src/xterm.c   Fri Oct  7 07:40:18 2005
***************
*** 1299,1305 ****
         XDrawImageString is usually faster than XDrawString.)  Always
         use XDrawImageString when drawing the cursor so that there is
         no chance that characters under a box cursor are invisible.  */
!       if (s->for_overlaps_p
          || (s->background_filled_p && s->hl != DRAW_CURSOR))
        {
          /* Draw characters with 16-bit or 8-bit functions.  */
--- 1299,1305 ----
         XDrawImageString is usually faster than XDrawString.)  Always
         use XDrawImageString when drawing the cursor so that there is
         no chance that characters under a box cursor are invisible.  */
!       if (s->for_overlaps
          || (s->background_filled_p && s->hl != DRAW_CURSOR))
        {
          /* Draw characters with 16-bit or 8-bit functions.  */
***************
*** 2604,2610 ****
    /* 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)
      {
        xassert (s->next->img == NULL);
        x_set_glyph_string_gc (s->next);
--- 2604,2610 ----
    /* 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)
      {
        xassert (s->next->img == NULL);
        x_set_glyph_string_gc (s->next);
***************
*** 2617,2623 ****
  
    /* 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))
--- 2617,2623 ----
  
    /* Draw relief (if any) in advance for char/composition so that the
       glyph string can be drawn over it.  */
!   if (!s->for_overlaps
        && s->face->box != FACE_NO_BOX
        && (s->first_glyph->type == CHAR_GLYPH
          || s->first_glyph->type == COMPOSITE_GLYPH))
***************
*** 2643,2649 ****
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps_p)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 0);
--- 2643,2649 ----
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 0);
***************
*** 2651,2657 ****
        break;
  
      case COMPOSITE_GLYPH:
!       if (s->for_overlaps_p || s->gidx > 0)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 1);
--- 2651,2657 ----
        break;
  
      case COMPOSITE_GLYPH:
!       if (s->for_overlaps || s->gidx > 0)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 1);
***************
*** 2662,2668 ****
        abort ();
      }
  
!   if (!s->for_overlaps_p)
      {
        /* Draw underline.  */
        if (s->face->underline_p)
--- 2662,2668 ----
        abort ();
      }
  
!   if (!s->for_overlaps)
      {
        /* Draw underline.  */
        if (s->face->underline_p)