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

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.140 emacs/src/w32term.c:1.141
*** emacs/src/w32term.c:1.140   Thu Jan 24 15:41:46 2002
--- emacs/src/w32term.c Wed Feb  6 15:57:44 2002
***************
*** 1220,1237 ****
  
        if (retval)
        {
          /* Don't trust the ABC widths.  For synthesized fonts they are
             wrong, and so is the result of GetCharWidth()!  */
          int real_width;
          GetCharWidth (hdc, *char2b, *char2b, &real_width);
! 
          pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC;
! 
          /* As far as I can tell, this is the best way to determine what
             ExtTextOut will do with the broken font.  */
          if (pcm->width != real_width)
            pcm->width = (pcm->width + real_width) / 2;
! 
          pcm->lbearing = char_widths.abcA;
          pcm->rbearing = char_widths.abcA + char_widths.abcB;
          pcm->ascent = FONT_BASE (font);
--- 1220,1241 ----
  
        if (retval)
        {
+ #if 0
+         /* Disabled until we can find a way to get the right results
+            on all versions of Windows.  */
+ 
          /* Don't trust the ABC widths.  For synthesized fonts they are
             wrong, and so is the result of GetCharWidth()!  */
          int real_width;
          GetCharWidth (hdc, *char2b, *char2b, &real_width);
! #endif
          pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC;
! #if 0
          /* As far as I can tell, this is the best way to determine what
             ExtTextOut will do with the broken font.  */
          if (pcm->width != real_width)
            pcm->width = (pcm->width + real_width) / 2;
! #endif
          pcm->lbearing = char_widths.abcA;
          pcm->rbearing = char_widths.abcA + char_widths.abcB;
          pcm->ascent = FONT_BASE (font);