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

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.144 emacs/src/w32term.c:1.145
*** emacs/src/w32term.c:1.144   Mon Feb 18 18:31:06 2002
--- emacs/src/w32term.c Fri Feb 22 18:59:50 2002
***************
*** 2735,2741 ****
  
  /* Encapsulate the different ways of displaying text under W32.  */
  
! void W32_TEXTOUT (s, x, y,chars,nchars)
       struct glyph_string * s;
       int x, y;
       wchar_t * chars;
--- 2735,2742 ----
  
  /* Encapsulate the different ways of displaying text under W32.  */
  
! static void
! w32_text_out (s, x, y,chars,nchars)
       struct glyph_string * s;
       int x, y;
       wchar_t * chars;
***************
*** 2749,2756 ****
    else if (s->first_glyph->w32_font_type == UNICODE_FONT)
      ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL);
    else
!     ExtTextOut (s->hdc, x, y, 0, NULL, (char *) chars,
!                 nchars * charset_dim, NULL);
  }
  
  #if GLYPH_DEBUG
--- 2750,2757 ----
    else if (s->first_glyph->w32_font_type == UNICODE_FONT)
      ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL);
    else
!     ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars,
!                nchars * charset_dim, NULL);
  }
  
  #if GLYPH_DEBUG
***************
*** 3483,3489 ****
            char1b[i] = BYTE2 (s->char2b[i]);
  
        /* Draw text with TextOut and friends. */
!       W32_TEXTOUT (s, x, s->ybase - boff, s->char2b, s->nchars);
      }
    if (s->font && s->font->hfont)
      SelectObject (s->hdc, old_font);
--- 3484,3490 ----
            char1b[i] = BYTE2 (s->char2b[i]);
  
        /* Draw text with TextOut and friends. */
!       w32_text_out (s, x, s->ybase - boff, s->char2b, s->nchars);
      }
    if (s->font && s->font->hfont)
      SelectObject (s->hdc, old_font);
***************
*** 3530,3536 ****
    else
      {
        for (i = 0; i < s->nchars; i++, ++s->gidx)
!           W32_TEXTOUT (s, x + s->cmp->offsets[s->gidx * 2],
                         s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
                         s->char2b + i, 1);
      }
--- 3531,3537 ----
    else
      {
        for (i = 0; i < s->nchars; i++, ++s->gidx)
!           w32_text_out (s, x + s->cmp->offsets[s->gidx * 2],
                         s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
                         s->char2b + i, 1);
      }