(w32_cache_char_metrics): Double check that font is

really fixed pitch before trusting tmPitchAndFamily.

(w32_cache_char_metrics): Double check that font is
really fixed pitch before trusting tmPitchAndFamily.
f1eed8ff · Jason Rumney · ea4233a7 · f1eed8ff
Commit f1eed8ff authored Oct 21, 2000 by Jason Rumney
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/w32term.c src/w32term.c +4 -1

No files found.
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1284,7 +1284,10 @@ w32_cache_char_metrics (font)
    }
  else
    {
-      if ((font->tm.tmPitchAndFamily & TMPF_FIXED_PITCH) != 0)
+      if (((font->tm.tmPitchAndFamily & TMPF_FIXED_PITCH) != 0)
+          /* Some fonts (eg DBCS fonts) are marked as fixed width even
+             though they contain characters of different widths. */
+          || (font->tm.tmMaxCharWidth != font->tm.tmAveCharWidth))
 	{
 	  /* Font is not fixed pitch, so cache per_char info for the
             ASCII characters.  It would be much more work, and probably