ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Use the fontconfig anti-aliasing setup even for non-fontconfig fonts.

This commit is contained in:
Alexandre Julliard 2012-11-05 22:32:51 +01:00
parent ddba05547f
commit 7fdba1f3dd
1 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
dlls/gdi32/freetype.c
View File

@ -203,7 +203,6 @@ MAKE_FUNCPTR(FcPatternDestroy);
MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetBool);
MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetInteger);
MAKE_FUNCPTR(FcPatternGetString); MAKE_FUNCPTR(FcPatternGetString);
MAKE_FUNCPTR(FcPatternPrint);
#endif #endif
#undef MAKE_FUNCPTR #undef MAKE_FUNCPTR
@ -516,6 +515,8 @@ struct font_mapping
static struct list mappings_list = LIST_INIT( mappings_list ); static struct list mappings_list = LIST_INIT( mappings_list );
static UINT default_aa_flags;
static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION freetype_cs;
static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION_DEBUG critsect_debug =
{ {
@ -1905,6 +1906,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
INT ret = 0; INT ret = 0;
DWORD aa_flags = HIWORD( flags ); DWORD aa_flags = HIWORD( flags );
if (!aa_flags) aa_flags = default_aa_flags;
/* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */
assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); assert(file || !(flags & ADDFONT_EXTERNAL_FONT));
@ -2378,23 +2381,43 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts)
} }
#ifdef SONAME_LIBFONTCONFIG #ifdef SONAME_LIBFONTCONFIG
static void load_fontconfig_fonts(void)
{
void *fc_handle = NULL;
FcPattern *pat;
FcObjectSet *os;
FcFontSet *fontset;
int i, len;
char *file;
const char *ext;
fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0); static BOOL fontconfig_enabled;
if(!fc_handle) {
TRACE("Wine cannot find the fontconfig library (%s).\n", static UINT parse_aa_pattern( FcPattern *pattern )
SONAME_LIBFONTCONFIG); {
FcBool antialias;
int rgba;
UINT aa_flags = 0;
if (pFcPatternGetBool( pattern, FC_ANTIALIAS, 0, &antialias ) == FcResultMatch)
aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP;
if (pFcPatternGetInteger( pattern, FC_RGBA, 0, &rgba ) == FcResultMatch)
{
switch (rgba)
{
case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break;
case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break;
case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break;
case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break;
case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break;
}
}
return aa_flags;
}
static void init_fontconfig(void)
{
void *fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0);
if (!fc_handle)
{
TRACE("Wine cannot find the fontconfig library (%s).\n", SONAME_LIBFONTCONFIG);
return; return;
} }
#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;}
#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;}
LOAD_FUNCPTR(FcConfigSubstitute); LOAD_FUNCPTR(FcConfigSubstitute);
LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontList);
LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcFontSetDestroy);
@ -2407,10 +2430,29 @@ LOAD_FUNCPTR(FcPatternDestroy);
LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetBool);
LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetInteger);
LOAD_FUNCPTR(FcPatternGetString); LOAD_FUNCPTR(FcPatternGetString);
LOAD_FUNCPTR(FcPatternPrint);
#undef LOAD_FUNCPTR #undef LOAD_FUNCPTR
if(!pFcInit()) return; if (pFcInit())
{
FcPattern *pattern = pFcPatternCreate();
pFcConfigSubstitute( NULL, pattern, FcMatchFont );
default_aa_flags = parse_aa_pattern( pattern );
pFcPatternDestroy( pattern );
TRACE( "enabled, default flags = %x\n", default_aa_flags );
fontconfig_enabled = TRUE;
}
}
static void load_fontconfig_fonts(void)
{
FcPattern *pat;
FcObjectSet *os;
FcFontSet *fontset;
int i, len;
char *file;
const char *ext;
if (!fontconfig_enabled) return;
pat = pFcPatternCreate(); pat = pFcPatternCreate();
os = pFcObjectSetCreate(); os = pFcObjectSetCreate();
@ -2422,13 +2464,10 @@ LOAD_FUNCPTR(FcPatternPrint);
if(!fontset) return; if(!fontset) return;
for(i = 0; i < fontset->nfont; i++) { for(i = 0; i < fontset->nfont; i++) {
FcBool scalable; FcBool scalable;
FcBool antialias; DWORD aa_flags;
int rgba;
DWORD aa_flags = 0;
if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch)
continue; continue;
TRACE("fontconfig: %s\n", file);
pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont );
@ -2442,20 +2481,8 @@ LOAD_FUNCPTR(FcPatternPrint);
continue; continue;
} }
if (pFcPatternGetBool( fontset->fonts[i], FC_ANTIALIAS, 0, &antialias ) == FcResultMatch) aa_flags = parse_aa_pattern( fontset->fonts[i] );
aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP; TRACE("fontconfig: %s aa %x\n", file, aa_flags);
if (pFcPatternGetInteger( fontset->fonts[i], FC_RGBA, 0, &rgba ) == FcResultMatch)
{
switch (rgba)
{
case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break;
case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break;
case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break;
case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break;
case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break;
}
}
len = strlen( file ); len = strlen( file );
if(len < 4) continue; if(len < 4) continue;
@ -2467,8 +2494,6 @@ LOAD_FUNCPTR(FcPatternPrint);
pFcFontSetDestroy(fontset); pFcFontSetDestroy(fontset);
pFcObjectSetDestroy(os); pFcObjectSetDestroy(os);
pFcPatternDestroy(pat); pFcPatternDestroy(pat);
sym_not_found:
return;
} }
#elif defined(HAVE_CARBON_CARBON_H) #elif defined(HAVE_CARBON_CARBON_H)
@ -3597,6 +3622,10 @@ static void init_font_list(void)
char *unixname; char *unixname;
const char *data_dir; const char *data_dir;
#ifdef SONAME_LIBFONTCONFIG
init_fontconfig();
#endif
delete_external_font_keys(); delete_external_font_keys();
/* load the system bitmap fonts */ /* load the system bitmap fonts */
@ -4989,10 +5018,15 @@ done:
{ {
WORD gasp_flags; WORD gasp_flags;
if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY))
{
TRACE( "font %s %d aa disabled by GASP\n",
debugstr_w(lf.lfFaceName), lf.lfHeight );
*aa_flags = GGO_BITMAP; *aa_flags = GGO_BITMAP;
} }
} }
} }
}
TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags );
dc->gdiFont = ret; dc->gdiFont = ret;
physdev->font = ret; physdev->font = ret;
} }