Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 13:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#124164

Browse Source 
r=mkaply, sr=blizzard, a=shaver
OS/2 only - code from Javier Pedemonte to properly set font heights
This commit is contained in:
mkaply%us.ibm.com 2002-04-24 03:55:18 +00:00
parent ee5fff30d0
commit b1fc2b2c1b
3 changed files with 57 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
gfx/src/os2/nsFontMetricsOS2.cpp
View File

@ -610,7 +610,7 @@ nsFontMetricsOS2::SetFontHandle( HPS aPS, nsFontOS2* aFont )
}
}
}
} /* endfor */
}
points = curPoints;
nsMemory::Free(pMetrics);
@ -1251,31 +1251,6 @@ nsFontMetricsOS2::GetVectorSubstitute( HPS aPS, const char* aFamilyname,
}
}
#if 0
// Generic case: see if this family has a vector font matching the
// given style
USHORT flags = isBold ? FM_SEL_BOLD : 0;
flags |= isItalic ? FM_SEL_ITALIC : 0;
long lFonts = 0;
FONTMETRICS* pMetrics = getMetrics( lFonts, aFamilyname, aPS );
if( lFonts > 0 )
{
for( int i = 0; i < lFonts; i++ )
{
if( (pMetrics[i].fsDefn & FM_DEFN_OUTLINE) &&
((pMetrics[i].fsSelection & (FM_SEL_ITALIC | FM_SEL_BOLD)) == flags) )
{
PL_strcpy( alias, pMetrics[i].szFacename );
return PR_TRUE;
}
}
}
nsMemory::Free(pMetrics);
#endif
return PR_FALSE;
}
@ -1363,28 +1338,22 @@ nsFontMetricsOS2::RealizeFont()
float dev2app;
mDeviceContext->GetDevUnitsToAppUnits(dev2app);
// Sometimes the fontmetrics for fonts don't add up as documented.
// Sometimes EmHeight + InternalLeading is greater than the MaxBaselineExt.
// This hack attempts to appease all fonts.
if( fm.lMaxBaselineExt >= fm.lEmHeight + fm.lInternalLeading )
{
mMaxHeight = NSToCoordRound( fm.lMaxBaselineExt * dev2app );
mEmHeight = NSToCoordRound((fm.lMaxBaselineExt - fm.lInternalLeading) * dev2app );
mEmAscent = NSToCoordRound((fm.lMaxAscender - fm.lInternalLeading) * dev2app );
}
else
{
mMaxHeight = NSToCoordRound((fm.lEmHeight + fm.lInternalLeading) * dev2app );
mEmHeight = NSToCoordRound( fm.lEmHeight * dev2app);
mEmAscent = NSToCoordRound((fm.lEmHeight - fm.lMaxDescender) * dev2app );
}
mMaxAscent = NSToCoordRound( (fm.lMaxAscender-1) * dev2app );
mMaxDescent = NSToCoordRound( (fm.lMaxDescender+1) * dev2app );
mFontHandle->mMaxAscent = mMaxAscent;
mFontHandle->mMaxDescent = mMaxDescent;
mMaxAscent = NSToCoordRound( fm.lMaxAscender * dev2app );
mMaxDescent = NSToCoordRound( fm.lMaxDescender * dev2app );
mInternalLeading = NSToCoordRound( fm.lInternalLeading * dev2app );
mExternalLeading = NSToCoordRound( fm.lExternalLeading * dev2app );
/* These two values aren't really used by mozilla */
mEmAscent = mMaxAscent - mInternalLeading;
mEmDescent = mMaxDescent;
mMaxHeight = mMaxAscent + mMaxDescent;
mEmHeight = mEmAscent + mEmDescent;
mMaxAdvance = NSToCoordRound( fm.lMaxCharInc * dev2app );
mEmDescent = NSToCoordRound( fm.lMaxDescender * dev2app );
mLeading = NSToCoordRound( fm.lInternalLeading * dev2app );
mXHeight = NSToCoordRound( fm.lXHeight * dev2app );
nscoord onePixel = NSToCoordRound(1 * dev2app);
@ -1398,12 +1367,7 @@ nsFontMetricsOS2::RealizeFont()
mStrikeoutPosition = NSToCoordRound( mXHeight / 2.0f);
mStrikeoutSize = PR_MAX(onePixel, NSToCoordRound(fm.lStrikeoutSize * dev2app));
// Let there always be a minimum of one pixel space between the text
// and the underline
if( fm.lEmHeight < 10 )
mUnderlinePosition = -NSToCoordRound( fm.lUnderscorePosition * dev2app );
else
mUnderlinePosition = -PR_MAX(onePixel*2, NSToCoordRound( fm.lUnderscorePosition * dev2app));
mUnderlinePosition = -NSToCoordRound( fm.lUnderscorePosition * dev2app );
mUnderlineSize = PR_MAX(onePixel, NSToCoordRound(fm.lUnderscoreSize * dev2app));
mAveCharWidth = PR_MAX(1, NSToCoordRound(fm.lAveCharWidth * dev2app));
@ -1467,12 +1431,35 @@ NS_IMETHODIMP nsFontMetricsOS2::GetHeight( nscoord &aHeight)
return NS_OK;
}
#ifdef FONT_LEADING_APIS_V2
NS_IMETHODIMP
nsFontMetricsOS2::GetInternalLeading(nscoord &aLeading)
{
aLeading = mInternalLeading;
return NS_OK;
}
NS_IMETHODIMP
nsFontMetricsOS2::GetExternalLeading(nscoord &aLeading)
{
aLeading = mExternalLeading;
return NS_OK;
}
#else
NS_IMETHODIMP nsFontMetricsOS2::GetLeading( nscoord &aLeading)
{
aLeading = mLeading;
aLeading = mInternalLeading;
return NS_OK;
}
NS_IMETHODIMP
nsFontMetricsOS2::GetNormalLineHeight(nscoord &aHeight)
{
aHeight = mEmHeight + mInternalLeading;
return NS_OK;
}
#endif
NS_IMETHODIMP nsFontMetricsOS2::GetMaxAscent( nscoord &aAscent)
{
aAscent = mMaxAscent;
@ -1515,13 +1502,6 @@ NS_IMETHODIMP nsFontMetricsOS2::GetLangGroup(nsIAtom** aLangGroup)
return NS_OK;
}
NS_IMETHODIMP
nsFontMetricsOS2::GetNormalLineHeight(nscoord &aHeight)
{
aHeight = mEmHeight + mLeading;
return NS_OK;
}
NS_IMETHODIMP
nsFontMetricsOS2::GetEmHeight(nscoord &aHeight)
{
@ -1999,15 +1979,6 @@ nsFontMetricsOS2::InitializeGlobalFonts()
printf( " %3d: %32s :", k, fm->szFamilyname );
printf( " %32s", fm->szFacename );
#if 0
int length = font->name.Length();
int destLength = length * 3 + 1;
char* pstr = new char[destLength];
int convertedLength = WideCharToMultiByte( fm->usCodePage, font->name.get(),
length, pstr, destLength );
printf( " : %32s", pstr );
#endif
if( fm->fsDefn & FM_DEFN_OUTLINE )
printf( " : vector" );
else

10
gfx/src/os2/nsFontMetricsOS2.h
View File

@ -153,8 +153,13 @@ class nsFontMetricsOS2 : public nsIFontMetrics
NS_IMETHOD GetUnderline( nscoord &aOffset, nscoord &aSize);
NS_IMETHOD GetHeight( nscoord &aHeight);
#ifdef FONT_LEADING_APIS_V2
NS_IMETHOD GetInternalLeading(nscoord &aLeading);
NS_IMETHOD GetExternalLeading(nscoord &aLeading);
#else
NS_IMETHOD GetLeading(nscoord &aLeading);
NS_IMETHOD GetNormalLineHeight(nscoord &aHeight);
NS_IMETHOD GetLeading( nscoord &aLeading);
#endif //FONT_LEADING_APIS_V2
NS_IMETHOD GetEmHeight(nscoord &aHeight);
NS_IMETHOD GetEmAscent(nscoord &aAscent);
NS_IMETHOD GetEmDescent(nscoord &aDescent);
@ -227,7 +232,8 @@ class nsFontMetricsOS2 : public nsIFontMetrics
nscoord mStrikeoutSize;
nscoord mUnderlinePosition;
nscoord mUnderlineSize;
nscoord mLeading;
nscoord mExternalLeading;
nscoord mInternalLeading;
nscoord mEmHeight;
nscoord mEmAscent;
nscoord mEmDescent;

16
gfx/src/os2/nsRenderingContextOS2.cpp
View File

@ -1638,8 +1638,8 @@ do_BreakGetTextDimensions(const nsFontSwitch* aFontSwitch,
FONTMETRICS fm;
GFX (::GpiQueryFontMetrics ( data->mPS, sizeof (fm), &fm), FALSE);
font->mMaxAscent = NSToCoordRound( fm.lMaxAscender * data->mP2T );
font->mMaxDescent = NSToCoordRound( fm.lMaxDescender * data->mP2T );
font->mMaxAscent = NSToCoordRound( (fm.lMaxAscender-1) * data->mP2T );
font->mMaxDescent = NSToCoordRound( (fm.lMaxDescender+1) * data->mP2T );
}
// Our current state relatively to the _full_ string...
@ -2086,10 +2086,14 @@ do_GetTextDimensions(const nsFontSwitch* aFontSwitch,
data->mWidth += font->GetWidth(data->mPS, aSubstring, aSubstringLength);
FONTMETRICS fm;
GFX (::GpiQueryFontMetrics (data->mPS, sizeof (fm), &fm), FALSE);
font->mMaxAscent = NSToCoordRound( fm.lMaxAscender * data->mP2T );
font->mMaxDescent = NSToCoordRound( fm.lMaxDescender * data->mP2T );
// set mMaxAscent & mMaxDescent if not already set in nsFontOS2 struct
if( font->mMaxAscent == 0 )
{
FONTMETRICS fm;
GFX (::GpiQueryFontMetrics ( data->mPS, sizeof (fm), &fm), FALSE);
font->mMaxAscent = NSToCoordRound( (fm.lMaxAscender-1) * data->mP2T );
font->mMaxDescent = NSToCoordRound( (fm.lMaxDescender+1) * data->mP2T );
}
if (data->mAscent < font->mMaxAscent) {
data->mAscent = font->mMaxAscent;