From 0230bfdf200803b91c082ea9ea515ba8f5f6fd11 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 10 May 2002 19:17:33 +0000 Subject: [PATCH] (enum_font_cb2): Don't use DBCS raster fonts. --- src/ChangeLog | 4 ++++ src/w32fns.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index b01580f0af7..7ebe89a9bc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-05-10 Jason Rumney + + * w32fns.c (enum_font_cb2): Don't use DBCS raster fonts. + 2002-05-10 Eli Zaretskii * coding.c (encode_coding_sjis_big5): Enclose bitwise AND in diff --git a/src/w32fns.c b/src/w32fns.c index bd51244e87f..66a5d5796b7 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6805,6 +6805,22 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet) return 1; + + if (FontType == RASTER_FONTTYPE) + { + /* DBCS raster fonts have problems displaying, so skip them. */ + int charset = lplf->elfLogFont.lfCharSet; + if (charset == SHIFTJIS_CHARSET + || charset == HANGEUL_CHARSET + || charset == CHINESEBIG5_CHARSET + || charset == GB2312_CHARSET +#ifdef JOHAB_CHARSET + || charset == JOHAB_CHARSET +#endif + ) + return 1; + } + { char buf[100]; Lisp_Object width = Qnil; -- 2.39.2