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

winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly.

This commit is contained in:
Alexandre Julliard 2010-06-29 14:58:31 +02:00
parent 5f884d19c6
commit 4d9a311771
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winex11.drv/xrender.c
View File

@ -905,6 +905,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
break; break;
} }
font_smoothing = TRUE; /* default to enabled */
#ifdef SONAME_LIBFONTCONFIG #ifdef SONAME_LIBFONTCONFIG
if (fontconfig_installed) if (fontconfig_installed)
{ {
@ -956,9 +957,10 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_BGR: entry->aa_default = AA_BGR; break;
case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break;
case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break;
case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; case FC_RGBA_NONE: entry->aa_default = AA_Grey; break;
} }
} }
if (!antialias) font_smoothing = FALSE;
pFcPatternDestroy( match ); pFcPatternDestroy( match );
} }
pFcPatternDestroy( pattern ); pFcPatternDestroy( pattern );
@ -984,11 +986,14 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR;
else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB;
else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR;
else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; else if (!strcmp( value, "none" )) entry->aa_default = AA_Grey;
} }
wine_tsx11_unlock(); wine_tsx11_unlock();
if (!antialias) font_smoothing = FALSE;
} }
if (!font_smoothing) entry->aa_default = AA_None;
/* we can't support subpixel without xrender */ /* we can't support subpixel without xrender */
if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey;
} }