Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 401988 - gfxPangoFontGroup::CreateGlyphRunsItemizing must use gfxPangoFont corresponding to the PangoFont from pango_shape (wrong glyphs selected when falling back to fonts of different style). Provide fontconfig with information re requested font even when non-existant. Map FONT_WEIGHT_NORMAL to Regular not Medium weight fonts. r=pavlov, sr=roc.

Browse Source
This commit is contained in:
karlt+@karlt.net 2008-01-26 23:37:29 -08:00
parent 81fbf66e17
commit 1a4597219a
5 changed files with 202 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/thebes/public/gfxFont.h
View File

@ -1447,9 +1447,6 @@ public:
void *closure);
PRBool ForEachFont(FontCreationCallback fc, void *closure);
/* this will call back fc with the a generic font based on the style's langgroup */
void FindGenericFontFromStyle(FontCreationCallback fc, void *closure);
const nsString& GetFamilies() { return mFamilies; }
protected:
@ -1457,12 +1454,25 @@ protected:
gfxFontStyle mStyle;
nsTArray< nsRefPtr<gfxFont> > mFonts;
/* If aResolveGeneric is true, then CSS/Gecko generic family names are
* replaced with preferred fonts.
*
* If aResolveFontName is true then fc() is called only for existing fonts
* and with actual font names. If false then fc() is called with each
* family name in aFamilies (after resolving CSS/Gecko generic family names
* if aResolveGeneric).
*/
static PRBool ForEachFontInternal(const nsAString& aFamilies,
const nsACString& aLangGroup,
PRBool aResolveGeneric,
PRBool aResolveFontName,
FontCreationCallback fc,
void *closure);
/* this will call back fc with the a generic font based on the style's langgroup */
void FindGenericFontFromStyle(PRBool aResolveFontName,
FontCreationCallback fc, void *closure);
static PRBool FontResolverProc(const nsAString& aName, void *aClosure);
};
#endif

14
gfx/thebes/public/gfxPangoFonts.h
View File

@ -64,15 +64,17 @@ public:
gfxPangoFont (const nsAString& aName,
const gfxFontStyle *aFontStyle);
virtual ~gfxPangoFont ();
static already_AddRefed<gfxPangoFont> GetOrMakeFont(PangoFont *aPangoFont);
static void Shutdown();
virtual const gfxFont::Metrics& GetMetrics();
void GetMozLang(nsACString &aMozLang);
void GetActualFontFamily(nsACString &aFamily);
PangoFont *GetPangoFont() { if (!mPangoFont) RealizePangoFont(); return mPangoFont; }
// Check GetStyle()->sizeAdjust != 0.0 before calling this
gfxFloat GetAdjustedSize() { if (!mPangoFont) RealizePangoFont(); return mAdjustedSize; }
PRUint32 GetGlyph(const PRUint32 aChar);
virtual nsString GetUniqueName();
@ -94,6 +96,8 @@ protected:
Metrics mMetrics;
gfxFloat mAdjustedSize;
gfxPangoFont(PangoFont *aPangoFont, const nsAString &aName,
const gfxFontStyle *aFontStyle);
void RealizePangoFont();
void GetCharSize(const char aChar, gfxSize& aInkSize, gfxSize& aLogSize,
PRUint32 *aGlyphID = nsnull);
@ -101,8 +105,6 @@ protected:
virtual PRBool SetupCairoFont(gfxContext *aContext);
};
class FontSelector;
class THEBES_API gfxPangoFontGroup : public gfxFontGroup {
public:
gfxPangoFontGroup (const nsAString& families,
@ -122,8 +124,6 @@ public:
}
protected:
friend class FontSelector;
// ****** Textrun glyph conversion helpers ******
/**

37
gfx/thebes/src/gfxFont.cpp
View File

@ -650,7 +650,7 @@ gfxFontGroup::ForEachFont(FontCreationCallback fc,
void *closure)
{
return ForEachFontInternal(mFamilies, mStyle.langGroup,
PR_TRUE, fc, closure);
PR_TRUE, PR_TRUE, fc, closure);
}
PRBool
@ -660,7 +660,7 @@ gfxFontGroup::ForEachFont(const nsAString& aFamilies,
void *closure)
{
return ForEachFontInternal(aFamilies, aLangGroup,
PR_FALSE, fc, closure);
PR_FALSE, PR_TRUE, fc, closure);
}
struct ResolveData {
@ -680,6 +680,7 @@ PRBool
gfxFontGroup::ForEachFontInternal(const nsAString& aFamilies,
const nsACString& aLangGroup,
PRBool aResolveGeneric,
PRBool aResolveFontName,
FontCreationCallback fc,
void *closure)
{
@ -767,14 +768,20 @@ gfxFontGroup::ForEachFontInternal(const nsAString& aFamilies,
if (!family.IsEmpty()) {
NS_LossyConvertUTF16toASCII gf(genericFamily);
ResolveData data(fc, gf, closure);
PRBool aborted;
gfxPlatform *pf = gfxPlatform::GetPlatform();
nsresult rv = pf->ResolveFontName(family,
gfxFontGroup::FontResolverProc,
&data, aborted);
if (NS_FAILED(rv) || aborted)
return PR_FALSE;
if (aResolveFontName) {
ResolveData data(fc, gf, closure);
PRBool aborted;
gfxPlatform *pf = gfxPlatform::GetPlatform();
nsresult rv = pf->ResolveFontName(family,
gfxFontGroup::FontResolverProc,
&data, aborted);
if (NS_FAILED(rv) || aborted)
return PR_FALSE;
}
else {
if (!fc(family, gf, closure))
return PR_FALSE;
}
}
if (generic && aResolveGeneric) {
@ -785,7 +792,8 @@ gfxFontGroup::ForEachFontInternal(const nsAString& aFamilies,
nsXPIDLString value;
nsresult rv = prefs->CopyUnicharPref(prefName.get(), getter_Copies(value));
if (NS_SUCCEEDED(rv)) {
ForEachFontInternal(value, lang, PR_FALSE, fc, closure);
ForEachFontInternal(value, lang, PR_FALSE, aResolveFontName,
fc, closure);
}
}
@ -803,7 +811,8 @@ gfxFontGroup::FontResolverProc(const nsAString& aName, void *aClosure)
}
void
gfxFontGroup::FindGenericFontFromStyle(FontCreationCallback fc,
gfxFontGroup::FindGenericFontFromStyle(PRBool aResolveFontName,
FontCreationCallback fc,
void *closure)
{
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID));
@ -827,7 +836,7 @@ gfxFontGroup::FindGenericFontFromStyle(FontCreationCallback fc,
rv = prefs->CopyUnicharPref(prefName.get(), getter_Copies(familyName));
if (NS_SUCCEEDED(rv)) {
ForEachFontInternal(familyName, mStyle.langGroup,
PR_FALSE, fc, closure);
PR_FALSE, aResolveFontName, fc, closure);
}
prefName.AssignLiteral("font.name-list.");
@ -838,7 +847,7 @@ gfxFontGroup::FindGenericFontFromStyle(FontCreationCallback fc,
rv = prefs->CopyUnicharPref(prefName.get(), getter_Copies(familyName));
if (NS_SUCCEEDED(rv)) {
ForEachFontInternal(familyName, mStyle.langGroup,
PR_FALSE, fc, closure);
PR_FALSE, aResolveFontName, fc, closure);
}
}
}

2
gfx/thebes/src/gfxOS2Fonts.cpp
View File

@ -429,7 +429,7 @@ gfxOS2FontGroup::gfxOS2FontGroup(const nsAString& aFamilies,
nsStringArray familyArray;
ForEachFont(FontCallback, &familyArray);
FindGenericFontFromStyle(FontCallback, &familyArray);
FindGenericFontFromStyle(PR_TRUE, FontCallback, &familyArray);
// To be able to easily search for glyphs in other fonts, append a few good
// replacement candidates to the list. The best ones are the Unicode fonts that

210
gfx/thebes/src/gfxPangoFonts.cpp
View File

@ -23,6 +23,7 @@
* Masayuki Nakano <masayuki@d-toybox.com>
* Behdad Esfahbod <behdad@gnome.org>
* Mats Palmgren <mats.palmgren@bredband.net>
* Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
*
* based on nsFontMetricsPango.cpp by
* Christopher Blizzard <blizzard@mozilla.org>
@ -119,7 +120,11 @@ gfxPangoFontGroup::FontCallback (const nsAString& fontName,
{
nsStringArray *sa = static_cast<nsStringArray*>(closure);
if (FFRECountHyphens(fontName) < 3 && sa->IndexOf(fontName) < 0) {
// We ignore prefs that have three hypens since they are X style prefs.
if (genericName.Length() && FFRECountHyphens(fontName) >= 3)
return PR_TRUE;
if (sa->IndexOf(fontName) < 0) {
sa->AppendString(fontName);
}
@ -154,24 +159,37 @@ gfxPangoFontGroup::gfxPangoFontGroup (const nsAString& families,
nsStringArray familyArray;
ForEachFont (FontCallback, &familyArray);
// Leave non-existing fonts in the list so that fontconfig can get the
// best match.
ForEachFontInternal(families, aStyle->langGroup, PR_TRUE, PR_FALSE,
FontCallback, &familyArray);
FindGenericFontFromStyle (FontCallback, &familyArray);
FindGenericFontFromStyle(PR_FALSE, FontCallback, &familyArray);
// XXX If there are no actual fonts, we should use dummy family.
// Pango will resolve from this.
// behdad: yep, looks good.
if (familyArray.Count() == 0) {
// Construct a string suitable for fontconfig
nsAutoString fcFamilies;
if (familyArray.Count()) {
int i = 0;
while (1) {
fcFamilies.Append(*familyArray[i]);
++i;
if (i >= familyArray.Count())
break;
fcFamilies.Append(NS_LITERAL_STRING(","));
}
}
else {
// XXX If there are no fonts, we should use dummy family.
// Pango will resolve from this.
// behdad: yep, looks good.
// printf("%s(%s)\n", NS_ConvertUTF16toUTF8(families).get(),
// aStyle->langGroup.get());
familyArray.AppendString(NS_LITERAL_STRING("sans-serif"));
fcFamilies.Append(NS_LITERAL_STRING("sans-serif"));
}
for (int i = 0; i < familyArray.Count(); i++) {
nsRefPtr<gfxPangoFont> font = GetOrMakeFont(*familyArray[i], &mStyle);
if (font) {
mFonts.AppendElement(font);
}
nsRefPtr<gfxPangoFont> font = GetOrMakeFont(fcFamilies, &mStyle);
if (font) {
mFonts.AppendElement(font);
}
}
@ -197,10 +215,33 @@ gfxPangoFont::gfxPangoFont(const nsAString &aName,
{
}
// key for locating a gfxPangoFont corresponding to a PangoFont
static GQuark GetFontQuark()
{
// Not using g_quark_from_static_string() because this module may be
// unloaded (which would leave a dangling pointer). Using
// g_quark_from_string() instead, which creates a small shutdown leak.
static GQuark quark = g_quark_from_string("moz-gfxFont");
return quark;
}
gfxPangoFont::gfxPangoFont(PangoFont *aPangoFont, const nsAString &aName,
const gfxFontStyle *aFontStyle)
: gfxFont(aName, aFontStyle),
mPangoFont(aPangoFont), mCairoFont(nsnull),
mHasMetrics(PR_FALSE), mAdjustedSize(aFontStyle->size)
{
g_object_ref(mPangoFont);
g_object_set_qdata(G_OBJECT(mPangoFont), GetFontQuark(), this);
}
gfxPangoFont::~gfxPangoFont()
{
if (mPangoFont)
if (mPangoFont) {
if (g_object_get_qdata(G_OBJECT(mPangoFont), GetFontQuark()) == this)
g_object_set_qdata(G_OBJECT(mPangoFont), GetFontQuark(), NULL);
g_object_unref(mPangoFont);
}
if (mCairoFont)
cairo_scaled_font_destroy(mCairoFont);
@ -232,6 +273,17 @@ ThebesStyleToPangoStyle (const gfxFontStyle *fs)
return PANGO_STYLE_NORMAL;
}
static PRUint8
PangoStyleToThebesStyle (PangoStyle aPangoStyle)
{
if (aPangoStyle == PANGO_STYLE_ITALIC)
return FONT_STYLE_ITALIC;
if (aPangoStyle == FONT_STYLE_OBLIQUE)
return FONT_STYLE_OBLIQUE;
return FONT_STYLE_NORMAL;
}
static PangoWeight
ThebesStyleToPangoWeight (const gfxFontStyle *fs)
{
@ -275,7 +327,7 @@ ThebesStyleToPangoWeight (const gfxFontStyle *fs)
/* Map to final PANGO_WEIGHT value */
static const int fcWeights[5] = {
349,
499,
449,
649,
749,
900
@ -284,6 +336,77 @@ ThebesStyleToPangoWeight (const gfxFontStyle *fs)
return (PangoWeight)fcWeights[fcWeight];
}
/* Note this doesn't check sizeAdjust */
static PangoFontDescription *
NewPangoFontDescription(const nsAString &aName, const gfxFontStyle *aFontStyle)
{
PangoFontDescription *fontDesc = pango_font_description_new();
pango_font_description_set_family(fontDesc,
NS_ConvertUTF16toUTF8(aName).get());
pango_font_description_set_absolute_size(fontDesc,
aFontStyle->size * PANGO_SCALE);
pango_font_description_set_style(fontDesc,
ThebesStyleToPangoStyle(aFontStyle));
pango_font_description_set_weight(fontDesc,
ThebesStyleToPangoWeight(aFontStyle));
return fontDesc;
}
/**
* The following gfxPangoFonts are accessed from the PangoFont, not from the
* gfxFontCache hash table. The gfxFontCache hash table is keyed by desired
* family and style, whereas here we only know actual family and style. There
* may be more than one of these fonts with the same family and style, but
* different PangoFont and actual font face.
*
* The point of this is to record the exact font face for gfxTextRun glyph
* indices. The style of this font does not necessarily represent the exact
* gfxFontStyle used to build the text run. Notably, the language is not
* recorded, but is used for GetMetrics().aveCharWidth. However, the font
* that should be used for aveCharWidth is gfxPangoFontGroup::GetFontAt(0),
* which is not constructed here.
*/
/* static */
already_AddRefed<gfxPangoFont>
gfxPangoFont::GetOrMakeFont(PangoFont *aPangoFont)
{
gfxPangoFont *font = static_cast<gfxPangoFont*>
(g_object_get_qdata(G_OBJECT(aPangoFont), GetFontQuark()));
if (!font) {
PangoFontDescription *desc =
pango_font_describe_with_absolute_size(aPangoFont);
// Shouldn't actually need to take too much care about the correct
// family or style, as size is the only thing expected to be
// important.
gfxFloat size =
pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
PRUint8 style =
PangoStyleToThebesStyle(pango_font_description_get_style(desc));
PRUint16 weight = pango_font_description_get_weight(desc);
NS_NAMED_LITERAL_CSTRING(langGroup, "x-unicode");
gfxFontStyle fontStyle(style, weight, size, langGroup, 0.0,
PR_TRUE, PR_FALSE);
// (The PangoFontDescription owns the family string)
const char *family = pango_font_description_get_family(desc);
font = new gfxPangoFont(aPangoFont,
NS_ConvertUTF8toUTF16(family), &fontStyle);
pango_font_description_free(desc);
if (!font)
return nsnull;
// Do not add this font to the gfxFontCache hash table as this may not
// be the PangoFont that fontconfig chooses for this style.
}
NS_ADDREF(font);
return font;
}
static PangoFont*
LoadPangoFont(PangoContext *aPangoCtx, const PangoFontDescription *aPangoFontDesc)
{
@ -307,13 +430,9 @@ gfxPangoFont::RealizePangoFont()
if (mPangoFont)
return;
PangoFontDescription *pangoFontDesc = pango_font_description_new();
PangoFontDescription *pangoFontDesc =
NewPangoFontDescription(mName, GetStyle());
pango_font_description_set_family(pangoFontDesc, NS_ConvertUTF16toUTF8(mName).get());
pango_font_description_set_style(pangoFontDesc, ThebesStyleToPangoStyle(GetStyle()));
pango_font_description_set_weight(pangoFontDesc, ThebesStyleToPangoWeight(GetStyle()));
//printf ("%s, %f, %d, %d\n", NS_ConvertUTF16toUTF8(mName).get(), GetStyle()->size, ThebesStyleToPangoStyle(GetStyle()), ThebesStyleToPangoWeight(GetStyle()));
PangoContext *pangoCtx = gdk_pango_context_get();
if (!GetStyle()->langGroup.IsEmpty()) {
@ -322,28 +441,29 @@ gfxPangoFont::RealizePangoFont()
pango_context_set_language(pangoCtx, lang);
}
gfxFloat size = GetStyle()->size;
pango_font_description_set_absolute_size(pangoFontDesc, size * PANGO_SCALE);
mPangoFont = LoadPangoFont(pangoCtx, pangoFontDesc);
gfxFloat size = GetStyle()->size;
// Checking mPangoFont to avoid infinite recursion through GetCharSize
if (size != 0.0 && GetStyle()->sizeAdjust != 0.0 && mPangoFont) {
// Could try xHeight from TrueType/OpenType fonts.
gfxSize isz, lsz;
GetCharSize('x', isz, lsz);
gfxSize isz, lsz;
GetCharSize('x', isz, lsz);
if (isz.height != 0.0) {
gfxFloat aspect = isz.height / size;
size = GetStyle()->GetAdjustedSize(aspect);
pango_font_description_set_absolute_size(pangoFontDesc,
size * PANGO_SCALE);
g_object_unref(mPangoFont);
g_object_unref(mPangoFont);
mPangoFont = LoadPangoFont(pangoCtx, pangoFontDesc);
}
}
NS_ASSERTION(mHasMetrics == PR_FALSE, "metrics will be invalid...");
mAdjustedSize = size;
if (!g_object_get_qdata(G_OBJECT(mPangoFont), GetFontQuark()))
g_object_set_qdata(G_OBJECT(mPangoFont), GetFontQuark(), this);
if (pangoFontDesc)
pango_font_description_free(pangoFontDesc);
@ -1104,26 +1224,20 @@ gfxPangoFontGroup::CreateGlyphRunsItemizing(gfxTextRun *aTextRun,
PRUint32 aUTF8HeaderLen)
{
PangoContext *context = gdk_pango_context_get ();
PangoContext *context = gdk_pango_context_get();
PangoFontDescription *fontDesc = pango_font_description_new();
// these should be FontEntries or something similar rather than gfxPangoFonts...
nsString fontList;
for (PRUint32 i = 0; i < mFonts.Length(); i++) {
fontList.Append(mFonts[i]->GetName());
fontList.Append(NS_LITERAL_STRING(","));
PangoFontDescription *fontDesc =
NewPangoFontDescription(GetFontAt(0)->GetName(), GetStyle());
if (GetStyle()->sizeAdjust != 0.0) {
gfxFloat size =
static_cast<gfxPangoFont*>(GetFontAt(0))->GetAdjustedSize();
pango_font_description_set_absolute_size(fontDesc, size * PANGO_SCALE);
}
PangoLanguage *lang = GetPangoLanguage(GetStyle()->langGroup);
pango_font_description_set_family(fontDesc, NS_ConvertUTF16toUTF8(fontList).get());
pango_font_description_set_absolute_size(fontDesc, GetStyle()->size * PANGO_SCALE);
pango_font_description_set_style(fontDesc, ThebesStyleToPangoStyle(GetStyle()));
pango_font_description_set_weight(fontDesc, ThebesStyleToPangoWeight(GetStyle()));
pango_context_set_font_description(context, fontDesc);
pango_font_description_free(fontDesc);
PangoLanguage *lang = GetPangoLanguage(GetStyle()->langGroup);
// we should set this to null if we don't have a text language from the page...
// except that we almost always have something...
@ -1154,14 +1268,8 @@ gfxPangoFontGroup::CreateGlyphRunsItemizing(gfxTextRun *aTextRun,
}
/* look up the gfxPangoFont from the PangoFont */
// XXX we need a function to do this.. until then do this
// behdad: use g_object_[sg]et_qdata() for it.
PangoFontDescription *d = pango_font_describe(item->analysis.font);
nsRefPtr<gfxPangoFont> font = GetOrMakeFont(NS_ConvertUTF8toUTF16(pango_font_description_get_family(d)), GetStyle());
//printf("Using %s\n", pango_font_description_get_family(d));
pango_font_description_free(d);
nsRefPtr<gfxPangoFont> font =
gfxPangoFont::GetOrMakeFont(item->analysis.font);
nsresult rv = aTextRun->AddGlyphRun(font, utf16Offset, PR_TRUE);
if (NS_FAILED(rv)) {
@ -1207,8 +1315,6 @@ out:
if (items)
g_list_free(items);
pango_font_description_free(fontDesc);
g_object_unref(context);
}