Commit 3036c985 authored by Eric Warnke's avatar Eric Warnke Committed by Alexandre Julliard

Don't match against Symbol or Nil fonts.

parent 59c4a32f
...@@ -1632,6 +1632,12 @@ static UINT32 XFONT_Match( fontMatch* pfm ) ...@@ -1632,6 +1632,12 @@ static UINT32 XFONT_Match( fontMatch* pfm )
} }
else if (plf->lfCharSet != pfi->df.dfCharSet) penalty += 0x200; 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 */ /* TMPF_FIXED_PITCH means exactly the opposite */
if( plf->lfPitchAndFamily & FIXED_PITCH ) if( plf->lfPitchAndFamily & FIXED_PITCH )
...@@ -1841,6 +1847,7 @@ static BOOL32 XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm ) ...@@ -1841,6 +1847,7 @@ static BOOL32 XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
for( start = fontList; start && score; start = start->next ) for( start = fontList; start && score; start = start->next )
{ {
fm.pfr = start; fm.pfr = start;
TRACE(font, "%s\n", fm.pfr->lfFaceName ); TRACE(font, "%s\n", fm.pfr->lfFaceName );
current_score = XFONT_MatchFIList( &fm ); current_score = XFONT_MatchFIList( &fm );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment