From 5e905a57375bfb8b1579c3404d40554adb2d7a9d Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Tue, 30 Oct 2001 22:26:40 +0000 Subject: [PATCH] (w32_to_x_charset): Increase size of XLFD charset buffer. (enum_font_cb2): Ignore fonts with vertical orientation. --- src/ChangeLog | 5 +++++ src/w32fns.c | 21 ++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5c5bfa4766..885b230f29 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-10-30 Jason Rumney + + * w32fns.c (w32_to_x_charset): Increase size of XLFD charset buffer. + (enum_font_cb2): Ignore fonts with vertical orientation. + 2001-10-30 Richard M. Stallman * keyboard.c (Finput_pending_p): Doc fix. diff --git a/src/w32fns.c b/src/w32fns.c index 55af56303e..0c7f94fed8 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5994,7 +5994,7 @@ static char * w32_to_x_charset (fncharset) int fncharset; { - static char buf[16]; + static char buf[32]; Lisp_Object charset_type; switch (fncharset) @@ -6141,8 +6141,8 @@ w32_to_x_charset (fncharset) return buf; } - strncpy(buf, best_match, 15); - buf[15] = '\0'; + strncpy(buf, best_match, 31); + buf[31] = '\0'; return buf; } } @@ -6672,13 +6672,16 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) int FontType; enumfont_t * lpef; { - if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline) - return (1); - + /* Ignore struck out, underlined and vertical versions of fonts. */ + if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline + || lplf->elfLogFont.lfEscapement != 0 + || lplf->elfLogFont.lfOrientation != 0) + return 1; + /* Check that the character set matches if it was specified */ if (lpef->logfont.lfCharSet != DEFAULT_CHARSET && lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet) - return (1); + return 1; { char buf[100]; @@ -6725,7 +6728,7 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) /* TODO: List all relevant charsets if charset not specified. */ if (!w32_to_x_font (&(lplf->elfLogFont), buf, 100, charset)) - return (0); + return 0; if (NILP (*(lpef->pattern)) || w32_font_match (buf, XSTRING (*(lpef->pattern))->data)) @@ -6736,7 +6739,7 @@ enum_font_cb2 (lplf, lptm, FontType, lpef) } } - return (1); + return 1; } static int CALLBACK -- 2.20.1