Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 288634 : enable Gfx/Pango to support non-ASCII font names and port some other changes from Gfx/Xft to Gfx/Pango (r=caillon, sr=dbaron)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179653 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jshin%mailaps.org
2005-09-05 06:00:50 +00:00
parent 884e04aa57
commit 1e28267974
3 changed files with 33 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
View File

@@ -52,6 +52,7 @@
#include "nsUnicharUtils.h"
#include "nsQuickSort.h"
#include "nsFontConfigUtils.h"
#include <fontconfig/fontconfig.h>
#include <gdk/gdk.h>
@@ -79,25 +80,6 @@ static int gNumInstances;
static NS_DEFINE_CID(kCharsetConverterManagerCID,
NS_ICHARSETCONVERTERMANAGER_CID);
struct MozPangoLangGroup {
const char *mozLangGroup;
const char *PangoLang;
};
static const MozPangoLangGroup MozPangoLangGroups[] = {
{ "x-western", "en" },
{ "x-central-euro", "pl" },
{ "x-cyrillic", "ru" },
{ "x-baltic", "lv" },
{ "x-devanagari", "hi" },
{ "x-tamil", "ta" },
{ "x-unicode", 0 },
{ "x-user-def", 0 },
};
#define NUM_PANGO_LANG_GROUPS (sizeof (MozPangoLangGroups) / \
sizeof (MozPangoLangGroups[0]))
#ifdef DEBUG
#define DUMP_PRUNICHAR(ustr, ulen) for (PRUint32 llen=0;llen<ulen;llen++) \
printf("0x%x ", ustr[llen]); \
@@ -114,11 +96,7 @@ static const MozPangoLangGroup MozPangoLangGroups[] = {
// Static function decls
static PRBool IsASCIIFontName (const nsString& aName);
static int FFRECountHyphens (nsACString &aFFREName);
static PangoLanguage *GetPangoLanguage(nsIAtom *aLangGroup);
static const MozPangoLangGroup* FindPangoLangGroup (nsACString &aLangGroup);
static void FreeGlobals (void);
@@ -1159,10 +1137,8 @@ nsresult
nsFontMetricsPango::FamilyExists(nsIDeviceContext *aDevice,
const nsString &aName)
{
if (!IsASCIIFontName(aName))
return NS_ERROR_FAILURE;
NS_ConvertUCS2toUTF8 name(aName);
// fontconfig family name is always in UTF-8
NS_ConvertUTF16toUTF8 name(aName);
nsresult rv = NS_ERROR_FAILURE;
PangoContext *context = gdk_pango_context_get();
@@ -1230,7 +1206,7 @@ nsFontMetricsPango::RealizeFont(void)
// we ignore prefs that have three hypens since they are X
// style prefs.
if (FFRECountHyphens(value) < 3) {
if (NS_FFRECountHyphens(value) < 3) {
nsCString tmpstr;
tmpstr.Append(value);
@@ -1288,13 +1264,12 @@ PRBool
nsFontMetricsPango::EnumFontCallback(const nsString &aFamily,
PRBool aIsGeneric, void *aData)
{
// make sure it's an ascii name, if not then return and continue
// enumerating
if (!IsASCIIFontName(aFamily))
return PR_TRUE;
NS_ConvertUTF16toUTF8 name(aFamily);
nsCAutoString name;
name.AssignWithConversion(aFamily.get());
// The newest fontconfig does the full Unicode case folding so that
// we're being lazy here by calling |ToLowerCase| after converting
// to UTF-8 assuming that in virtually all cases, we just have to
// fold [A-Z]. (bug 223653).
ToLowerCase(name);
nsFontMetricsPango *metrics = (nsFontMetricsPango *)aData;
metrics->mFontList.AppendCString(name);
@@ -1555,37 +1530,6 @@ nsFontMetricsPango::FixupSpaceWidths (PangoLayout *aLayout,
}
}
/* static */
PRBool
IsASCIIFontName(const nsString& aName)
{
PRUint32 len = aName.Length();
const PRUnichar* str = aName.get();
for (PRUint32 i = 0; i < len; i++) {
/*
* X font names are printable ASCII, ignore others (for now)
*/
if ((str[i] < 0x20) || (str[i] > 0x7E)) {
return PR_FALSE;
}
}
return PR_TRUE;
}
/* static */
int
FFRECountHyphens (nsACString &aFFREName)
{
int h = 0;
PRInt32 hyphen = 0;
while ((hyphen = aFFREName.FindChar('-', hyphen)) >= 0) {
++h;
++hyphen;
}
return h;
}
/* static */
PangoLanguage *
GetPangoLanguage(nsIAtom *aLangGroup)
@@ -1596,8 +1540,8 @@ GetPangoLanguage(nsIAtom *aLangGroup)
// see if the lang group needs to be translated from mozilla's
// internal mapping into fontconfig's
const struct MozPangoLangGroup *langGroup;
langGroup = FindPangoLangGroup(cname);
const MozGtkLangGroup *langGroup;
langGroup = NS_FindFCLangGroup(cname);
// if there's no lang group, just use the lang group as it was
// passed to us
@@ -1606,26 +1550,12 @@ GetPangoLanguage(nsIAtom *aLangGroup)
// safe.
if (!langGroup)
return pango_language_from_string(cname.get());
else if (langGroup->PangoLang)
return pango_language_from_string(langGroup->PangoLang);
else if (langGroup->Lang)
return pango_language_from_string((char *) langGroup->Lang);
return pango_language_from_string("en");
}
/* static */
const MozPangoLangGroup*
FindPangoLangGroup (nsACString &aLangGroup)
{
for (unsigned int i=0; i < NUM_PANGO_LANG_GROUPS; ++i) {
if (aLangGroup.Equals(MozPangoLangGroups[i].mozLangGroup,
nsCaseInsensitiveCStringComparator())) {
return &MozPangoLangGroups[i];
}
}
return nsnull;
}
/* static */
void
FreeGlobals(void)
@@ -1783,7 +1713,6 @@ EnumFontsPango(nsIAtom* aLangGroup, const char* aGeneric,
for (int i=0; i < fs->nfont; ++i) {
char *family;
PRUnichar *name;
// if there's no family, just move to the next iteration
if (FcPatternGetString (fs->fonts[i], FC_FAMILY, 0,
@@ -1791,18 +1720,12 @@ EnumFontsPango(nsIAtom* aLangGroup, const char* aGeneric,
continue;
}
name = NS_STATIC_CAST(PRUnichar *,
nsMemory::Alloc ((strlen (family) + 1)
* sizeof (PRUnichar)));
// fontconfig always returns family names in UTF-8
PRUnichar* name = UTF8ToNewUnicode(nsDependentCString(family));
if (!name)
goto end;
PRUnichar *r = name;
for (char *f = family; *f; ++f)
*r++ = *f;
*r = '\0';
array[narray++] = name;
}

30
mozilla/gfx/src/shared/nsFontConfigUtils.cpp
View File

@@ -39,12 +39,7 @@
#include "nsIPrefBranch.h"
#include "nsFontConfigUtils.h"
struct MozXftLangGroup {
const char *mozLangGroup;
const FcChar8 *XftLang;
};
const MozXftLangGroup MozXftLangGroups[] = {
const MozGtkLangGroup MozGtkLangGroups[] = {
{ "x-western", (const FcChar8 *)"en" },
{ "x-central-euro", (const FcChar8 *)"pl" },
{ "x-cyrillic", (const FcChar8 *)"ru" },
@@ -64,20 +59,19 @@ const MozXftLangGroup MozXftLangGroups[] = {
{ "x-user-def", 0 },
};
#define NUM_XFT_LANG_GROUPS (sizeof (MozXftLangGroups) / \
sizeof (MozXftLangGroups[0]))
#define NUM_GTK_LANG_GROUPS (sizeof (MozGtkLangGroups) / \
sizeof (MozGtkLangGroups[0]))
static
void FFREToFamily(nsACString &aFFREName, nsACString &oFamily);
static
const MozXftLangGroup*
FindFCLangGroup (nsACString &aLangGroup)
const MozGtkLangGroup*
NS_FindFCLangGroup (nsACString &aLangGroup)
{
for (unsigned int i=0; i < NUM_XFT_LANG_GROUPS; ++i) {
if (aLangGroup.Equals(MozXftLangGroups[i].mozLangGroup,
for (unsigned int i=0; i < NUM_GTK_LANG_GROUPS; ++i) {
if (aLangGroup.Equals(MozGtkLangGroups[i].mozLangGroup,
nsCaseInsensitiveCStringComparator())) {
return &MozXftLangGroups[i];
return &MozGtkLangGroups[i];
}
}
@@ -162,8 +156,8 @@ NS_AddLangGroup(FcPattern *aPattern, nsIAtom *aLangGroup)
// see if the lang group needs to be translated from mozilla's
// internal mapping into fontconfig's
const struct MozXftLangGroup *langGroup;
langGroup = FindFCLangGroup(cname);
const struct MozGtkLangGroup *langGroup;
langGroup = NS_FindFCLangGroup(cname);
// if there's no lang group, just use the lang group as it was
// passed to us
@@ -172,8 +166,8 @@ NS_AddLangGroup(FcPattern *aPattern, nsIAtom *aLangGroup)
// safe.
if (!langGroup)
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)cname.get());
else if (langGroup->XftLang)
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)langGroup->XftLang);
else if (langGroup->Lang)
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)langGroup->Lang);
}
void

6
mozilla/gfx/src/shared/nsFontConfigUtils.h
View File

@@ -45,6 +45,11 @@
#include <fontconfig/fontconfig.h>
struct MozGtkLangGroup {
const char *mozLangGroup;
const FcChar8 *Lang;
};
extern int NS_CalculateSlant (PRUint8 aStyle);
extern int NS_CalculateWeight (PRUint16 aWeight);
extern void NS_AddLangGroup (FcPattern *aPattern, nsIAtom *aLangGroup);
@@ -55,5 +60,6 @@ extern void NS_AddGenericFontFromPref (const nsCString *aGenericFont,
nsIAtom *aLangGroup,
FcPattern *aPattern,
const PRLogModuleInfo *aLogModule);
extern const MozGtkLangGroup* NS_FindFCLangGroup (nsACString &aLangGroup);
#endif