зеркало из https://github.com/mozilla/gecko-dev.git
Move the code needed to get language group-specific font enumeration working and remove the rest of nsFontConfigUtils. b=379888 r=vlad
This commit is contained in:
dbaron@dbaron.org
Родитель
80fda011b1
Коммит
165c686649
|
|
@ -69,11 +69,5 @@ CPPSRCS = \
|
|||
LOCAL_INCLUDES = -I$(srcdir)/.. \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_ENABLE_XFT
|
||||
REQUIRES += pref
|
||||
CPPSRCS += nsFontConfigUtils.cpp
|
||||
LOCAL_INCLUDES += $(MOZ_XFT_CFLAGS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,288 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Christopher Blizzard
|
||||
* <blizzard@mozilla.org>. Portions created by the Initial Developer
|
||||
* are Copyright (C) 2002 the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsIPrefService.h"
|
||||
#include "nsIPrefBranch.h"
|
||||
#include "nsFontConfigUtils.h"
|
||||
|
||||
const MozGtkLangGroup MozGtkLangGroups[] = {
|
||||
{ "x-western", (const FcChar8 *)"en" },
|
||||
{ "x-central-euro", (const FcChar8 *)"pl" },
|
||||
{ "x-cyrillic", (const FcChar8 *)"ru" },
|
||||
{ "x-baltic", (const FcChar8 *)"lv" },
|
||||
{ "x-devanagari", (const FcChar8 *)"hi" },
|
||||
{ "x-tamil", (const FcChar8 *)"ta" },
|
||||
{ "x-armn", (const FcChar8 *)"hy" },
|
||||
{ "x-beng", (const FcChar8 *)"bn" },
|
||||
{ "x-cans", (const FcChar8 *)"iu" },
|
||||
{ "x-ethi", (const FcChar8 *)"am" },
|
||||
{ "x-geor", (const FcChar8 *)"ka" },
|
||||
{ "x-gujr", (const FcChar8 *)"gu" },
|
||||
{ "x-guru", (const FcChar8 *)"pa" },
|
||||
{ "x-khmr", (const FcChar8 *)"km" },
|
||||
{ "x-mlym", (const FcChar8 *)"ml" },
|
||||
{ "x-unicode", 0 },
|
||||
{ "x-user-def", 0 },
|
||||
};
|
||||
|
||||
#define NUM_GTK_LANG_GROUPS (sizeof (MozGtkLangGroups) / \
|
||||
sizeof (MozGtkLangGroups[0]))
|
||||
|
||||
static
|
||||
void FFREToFamily(nsACString &aFFREName, nsACString &oFamily);
|
||||
|
||||
const MozGtkLangGroup*
|
||||
NS_FindFCLangGroup (nsACString &aLangGroup)
|
||||
{
|
||||
for (unsigned int i=0; i < NUM_GTK_LANG_GROUPS; ++i) {
|
||||
if (aLangGroup.Equals(MozGtkLangGroups[i].mozLangGroup,
|
||||
nsCaseInsensitiveCStringComparator())) {
|
||||
return &MozGtkLangGroups[i];
|
||||
}
|
||||
}
|
||||
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
int
|
||||
NS_CalculateSlant(PRUint8 aStyle)
|
||||
{
|
||||
int fcSlant;
|
||||
|
||||
switch(aStyle) {
|
||||
case NS_FONT_STYLE_ITALIC:
|
||||
fcSlant = FC_SLANT_ITALIC;
|
||||
break;
|
||||
case NS_FONT_STYLE_OBLIQUE:
|
||||
fcSlant = FC_SLANT_OBLIQUE;
|
||||
break;
|
||||
default:
|
||||
fcSlant = FC_SLANT_ROMAN;
|
||||
break;
|
||||
}
|
||||
|
||||
return fcSlant;
|
||||
}
|
||||
|
||||
int
|
||||
NS_CalculateWeight (PRUint16 aWeight)
|
||||
{
|
||||
/*
|
||||
* weights come in two parts crammed into one
|
||||
* integer -- the "base" weight is weight / 100,
|
||||
* the rest of the value is the "offset" from that
|
||||
* weight -- the number of steps to move to adjust
|
||||
* the weight in the list of supported font weights,
|
||||
* this value can be negative or positive.
|
||||
*/
|
||||
PRInt32 baseWeight = (aWeight + 50) / 100;
|
||||
PRInt32 offset = aWeight - baseWeight * 100;
|
||||
|
||||
/* clip weights to range 0 to 9 */
|
||||
if (baseWeight < 0)
|
||||
baseWeight = 0;
|
||||
if (baseWeight > 9)
|
||||
baseWeight = 9;
|
||||
|
||||
/* Map from weight value to fcWeights index */
|
||||
static int fcWeightLookup[10] = {
|
||||
0, 0, 0, 0, 1, 1, 2, 3, 3, 4,
|
||||
};
|
||||
|
||||
PRInt32 fcWeight = fcWeightLookup[baseWeight];
|
||||
|
||||
/*
|
||||
* adjust by the offset value, make sure we stay inside the
|
||||
* fcWeights table
|
||||
*/
|
||||
fcWeight += offset;
|
||||
if (fcWeight < 0)
|
||||
fcWeight = 0;
|
||||
if (fcWeight > 4)
|
||||
fcWeight = 4;
|
||||
|
||||
/* Map to final FC_WEIGHT value */
|
||||
static int fcWeights[5] = {
|
||||
FC_WEIGHT_LIGHT, /* 0 */
|
||||
FC_WEIGHT_MEDIUM, /* 1 */
|
||||
FC_WEIGHT_DEMIBOLD, /* 2 */
|
||||
FC_WEIGHT_BOLD, /* 3 */
|
||||
FC_WEIGHT_BLACK, /* 4 */
|
||||
};
|
||||
|
||||
return fcWeights[fcWeight];
|
||||
}
|
||||
|
||||
void
|
||||
NS_AddLangGroup(FcPattern *aPattern, nsIAtom *aLangGroup)
|
||||
{
|
||||
// Find the FC lang group for this lang group
|
||||
nsCAutoString cname;
|
||||
aLangGroup->ToUTF8String(cname);
|
||||
|
||||
// see if the lang group needs to be translated from mozilla's
|
||||
// internal mapping into fontconfig's
|
||||
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
|
||||
//
|
||||
// we're casting away the const here for the strings - should be
|
||||
// safe.
|
||||
if (!langGroup)
|
||||
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)cname.get());
|
||||
else if (langGroup->Lang)
|
||||
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)langGroup->Lang);
|
||||
}
|
||||
|
||||
void
|
||||
NS_AddFFRE(FcPattern *aPattern, nsCString *aFamily, PRBool aWeak)
|
||||
{
|
||||
nsCAutoString family;
|
||||
FFREToFamily(*aFamily, family);
|
||||
|
||||
FcValue v;
|
||||
v.type = FcTypeString;
|
||||
// casting away the const here, should be safe
|
||||
v.u.s = (FcChar8 *)family.get();
|
||||
|
||||
if (aWeak)
|
||||
FcPatternAddWeak(aPattern, FC_FAMILY, v, FcTrue);
|
||||
else
|
||||
FcPatternAdd(aPattern, FC_FAMILY, v, FcTrue);
|
||||
}
|
||||
|
||||
/* static */
|
||||
void
|
||||
FFREToFamily(nsACString &aFFREName, nsACString &oFamily)
|
||||
{
|
||||
if (NS_FFRECountHyphens(aFFREName) == 3) {
|
||||
PRInt32 familyHyphen = aFFREName.FindChar('-') + 1;
|
||||
PRInt32 registryHyphen = aFFREName.FindChar('-',familyHyphen);
|
||||
oFamily.Append(Substring(aFFREName, familyHyphen,
|
||||
registryHyphen-familyHyphen));
|
||||
}
|
||||
else {
|
||||
oFamily.Append(aFFREName);
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
NS_FFRECountHyphens (nsACString &aFFREName)
|
||||
{
|
||||
int h = 0;
|
||||
PRInt32 hyphen = 0;
|
||||
while ((hyphen = aFFREName.FindChar('-', hyphen)) >= 0) {
|
||||
++h;
|
||||
++hyphen;
|
||||
}
|
||||
return h;
|
||||
}
|
||||
|
||||
inline static void
|
||||
AddFFREandLog(FcPattern *aPattern, nsCString aFamily,
|
||||
const PRLogModuleInfo *aLogModule)
|
||||
{
|
||||
// we ignore prefs that have three hypens since they are X
|
||||
// style prefs.
|
||||
if (NS_FFRECountHyphens(aFamily) >= 3)
|
||||
return;
|
||||
|
||||
if (aLogModule && PR_LOG_TEST(aLogModule, PR_LOG_DEBUG)) {
|
||||
printf("\tadding generic font from preferences: %s\n",
|
||||
aFamily.get());
|
||||
}
|
||||
|
||||
NS_AddFFRE(aPattern, &aFamily, PR_FALSE);
|
||||
}
|
||||
|
||||
// Add prefs (font.name.[generic].[lang] and font.name-list.[generic].[lang])
|
||||
// for the generic if they're set.
|
||||
void
|
||||
NS_AddGenericFontFromPref(const nsCString *aGenericFont,
|
||||
nsIAtom *aLangGroup, FcPattern *aPattern,
|
||||
const PRLogModuleInfo *aLogModule)
|
||||
{
|
||||
nsCOMPtr<nsIPrefService> prefService;
|
||||
prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
|
||||
if (!prefService)
|
||||
return;
|
||||
nsCOMPtr<nsIPrefBranch> pref;
|
||||
if (NS_FAILED(prefService->GetBranch("font.", getter_AddRefs(pref))))
|
||||
return;
|
||||
|
||||
nsCAutoString genericDotLangGroup(aGenericFont->get());
|
||||
genericDotLangGroup.Append('.');
|
||||
nsAutoString langGroup;
|
||||
aLangGroup->ToString(langGroup);
|
||||
LossyAppendUTF16toASCII(langGroup, genericDotLangGroup);
|
||||
|
||||
nsCAutoString name("name.");
|
||||
name.Append(genericDotLangGroup);
|
||||
|
||||
// prefs file always uses (must use) UTF-8 and fontconfig
|
||||
// expects to get a UTF-8 string so that using |GetCharPref|
|
||||
// is fine.
|
||||
nsresult rv;
|
||||
nsXPIDLCString value;
|
||||
rv = pref->GetCharPref(name.get(), getter_Copies(value));
|
||||
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
AddFFREandLog(aPattern, value, aLogModule);
|
||||
}
|
||||
|
||||
nsCAutoString nameList("name-list.");
|
||||
nameList.Append(genericDotLangGroup);
|
||||
rv = pref->GetCharPref(nameList.get(), getter_Copies(value));
|
||||
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
PRInt32 prevCommaPos = -1;
|
||||
PRInt32 commaPos;
|
||||
nsCAutoString family;
|
||||
|
||||
while ((commaPos = value.FindChar(',', prevCommaPos + 1)) > 0) {
|
||||
family = Substring(value, prevCommaPos + 1,
|
||||
commaPos - prevCommaPos - 1);
|
||||
prevCommaPos = commaPos;
|
||||
AddFFREandLog(aPattern, family, aLogModule);
|
||||
}
|
||||
|
||||
family = Substring(value, prevCommaPos + 1);
|
||||
AddFFREandLog(aPattern, family, aLogModule);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Christopher Blizzard
|
||||
* <blizzard@mozilla.org>. Portions created by the Initial Developer
|
||||
* are Copyright (C) 2002 the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef nsFontConfigUtils_h__
|
||||
#define nsFontConfigUtils_h__
|
||||
|
||||
#include "nspr.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIAtom.h"
|
||||
#include "nsFont.h"
|
||||
#include "prlog.h"
|
||||
|
||||
#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);
|
||||
extern void NS_AddFFRE (FcPattern *aPattern, nsCString *aFamily,
|
||||
PRBool aWeak);
|
||||
extern int NS_FFRECountHyphens (nsACString &aFFREName);
|
||||
extern void NS_AddGenericFontFromPref (const nsCString *aGenericFont,
|
||||
nsIAtom *aLangGroup,
|
||||
FcPattern *aPattern,
|
||||
const PRLogModuleInfo *aLogModule);
|
||||
extern const MozGtkLangGroup* NS_FindFCLangGroup (nsACString &aLangGroup);
|
||||
#endif
|
||||
|
||||
|
|
@ -109,8 +109,67 @@ gfxFontconfigUtils::GetFontList(const nsACString& aLangGroup,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
// this is in nsFontConfigUtils.h
|
||||
extern void NS_AddLangGroup (FcPattern *aPattern, nsIAtom *aLangGroup);
|
||||
struct MozGtkLangGroup {
|
||||
const char *mozLangGroup;
|
||||
const FcChar8 *Lang;
|
||||
};
|
||||
|
||||
const MozGtkLangGroup MozGtkLangGroups[] = {
|
||||
{ "x-western", (const FcChar8 *)"en" },
|
||||
{ "x-central-euro", (const FcChar8 *)"pl" },
|
||||
{ "x-cyrillic", (const FcChar8 *)"ru" },
|
||||
{ "x-baltic", (const FcChar8 *)"lv" },
|
||||
{ "x-devanagari", (const FcChar8 *)"hi" },
|
||||
{ "x-tamil", (const FcChar8 *)"ta" },
|
||||
{ "x-armn", (const FcChar8 *)"hy" },
|
||||
{ "x-beng", (const FcChar8 *)"bn" },
|
||||
{ "x-cans", (const FcChar8 *)"iu" },
|
||||
{ "x-ethi", (const FcChar8 *)"am" },
|
||||
{ "x-geor", (const FcChar8 *)"ka" },
|
||||
{ "x-gujr", (const FcChar8 *)"gu" },
|
||||
{ "x-guru", (const FcChar8 *)"pa" },
|
||||
{ "x-khmr", (const FcChar8 *)"km" },
|
||||
{ "x-mlym", (const FcChar8 *)"ml" },
|
||||
{ "x-unicode", 0 },
|
||||
{ "x-user-def", 0 }
|
||||
};
|
||||
|
||||
static const MozGtkLangGroup*
|
||||
NS_FindFCLangGroup (nsACString &aLangGroup)
|
||||
{
|
||||
for (unsigned int i=0; i < NS_ARRAY_LENGTH(MozGtkLangGroups); ++i) {
|
||||
if (aLangGroup.Equals(MozGtkLangGroups[i].mozLangGroup,
|
||||
nsCaseInsensitiveCStringComparator())) {
|
||||
return &MozGtkLangGroups[i];
|
||||
}
|
||||
}
|
||||
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
static void
|
||||
NS_AddLangGroup(FcPattern *aPattern, nsIAtom *aLangGroup)
|
||||
{
|
||||
// Find the FC lang group for this lang group
|
||||
nsCAutoString cname;
|
||||
aLangGroup->ToUTF8String(cname);
|
||||
|
||||
// see if the lang group needs to be translated from mozilla's
|
||||
// internal mapping into fontconfig's
|
||||
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
|
||||
//
|
||||
// we're casting away the const here for the strings - should be
|
||||
// safe.
|
||||
if (!langGroup)
|
||||
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)cname.get());
|
||||
else if (langGroup->Lang)
|
||||
FcPatternAddString(aPattern, FC_LANG, (FcChar8 *)langGroup->Lang);
|
||||
}
|
||||
|
||||
|
||||
nsresult
|
||||
gfxFontconfigUtils::GetFontListInternal(nsCStringArray& aListOfFonts,
|
||||
|
|
@ -134,7 +193,7 @@ gfxFontconfigUtils::GetFontListInternal(nsCStringArray& aListOfFonts,
|
|||
// take the pattern and add the lang group to it
|
||||
if (aLangGroup && !aLangGroup->IsEmpty()) {
|
||||
nsCOMPtr<nsIAtom> langAtom = do_GetAtom(*aLangGroup);
|
||||
//XXX fix me //NS_AddLangGroup(pat, langAtom);
|
||||
NS_AddLangGroup(pat, langAtom);
|
||||
}
|
||||
|
||||
fs = FcFontList(NULL, pat, os);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче