From 3036c985bd544308d10a4d6d26a42be701c153e6 Mon Sep 17 00:00:00 2001 From: Eric Warnke Date: Tue, 24 Nov 1998 20:43:06 +0000 Subject: [PATCH] Don't match against Symbol or Nil fonts. --- graphics/x11drv/xfont.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c index e4a43ff5913..9c670a3f075 100644 --- a/graphics/x11drv/xfont.c +++ b/graphics/x11drv/xfont.c @@ -1632,6 +1632,12 @@ static UINT32 XFONT_Match( fontMatch* pfm ) } else if (plf->lfCharSet != pfi->df.dfCharSet) penalty += 0x200; + /* FIXME: Hack to demote symbols and nil fonts. Should take into + account if a program ever actually asked for this type of + font */ + if ( (strcmp(pfm->pfr->lfFaceName,"Symbol")==0) || (strcmp(pfm->pfr->lfFaceName,"Nil")==0) ) + penalty += 0x200; /* very stiff penality */ + /* TMPF_FIXED_PITCH means exactly the opposite */ if( plf->lfPitchAndFamily & FIXED_PITCH ) @@ -1841,6 +1847,7 @@ static BOOL32 XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm ) for( start = fontList; start && score; start = start->next ) { fm.pfr = start; + TRACE(font, "%s\n", fm.pfr->lfFaceName ); current_score = XFONT_MatchFIList( &fm );