mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 19:05:52 +00:00
Consolidate filling of TEXTMETRICS to a single location.
svn path=/trunk/; revision=12369
This commit is contained in:
Gé van Geldorp
parent
8bd8d19886
commit
befed0390b
1 changed files with 149 additions and 139 deletions
|
|
@ -22,7 +22,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: text.c,v 1.122 2004/12/18 21:35:35 royce Exp $ */
|
/* $Id: text.c,v 1.123 2004/12/27 20:06:55 gvg Exp $ */
|
||||||
#include <w32k.h>
|
#include <w32k.h>
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
|
|
@ -694,6 +694,114 @@ NtGdiTranslateCharsetInfo(PDWORD Src,
|
||||||
return (BOOL) Ret;
|
return (BOOL) Ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void FASTCALL
|
||||||
|
FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori)
|
||||||
|
{
|
||||||
|
FT_Fixed XScale, YScale;
|
||||||
|
int Ascent, Descent;
|
||||||
|
|
||||||
|
XScale = Face->size->metrics.x_scale;
|
||||||
|
YScale = Face->size->metrics.y_scale;
|
||||||
|
|
||||||
|
if (0 == pOS2->usWinAscent + pOS2->usWinDescent)
|
||||||
|
{
|
||||||
|
Ascent = pHori->Ascender;
|
||||||
|
Descent = -pHori->Descender;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Ascent = pOS2->usWinAscent;
|
||||||
|
Descent = pOS2->usWinDescent;
|
||||||
|
}
|
||||||
|
|
||||||
|
TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6;
|
||||||
|
TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6;
|
||||||
|
TM->tmInternalLeading = (FT_MulFix(Ascent + Descent
|
||||||
|
- Face->units_per_EM, YScale) + 32) >> 6;
|
||||||
|
|
||||||
|
TM->tmHeight = TM->tmAscent + TM->tmDescent;
|
||||||
|
|
||||||
|
/* MSDN says:
|
||||||
|
* el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender)))
|
||||||
|
*/
|
||||||
|
TM->tmExternalLeading = max(0, (FT_MulFix(pHori->Line_Gap
|
||||||
|
- ((Ascent + Descent)
|
||||||
|
- (pHori->Ascender - pHori->Descender)),
|
||||||
|
YScale) + 32) >> 6);
|
||||||
|
|
||||||
|
TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6;
|
||||||
|
if (0 == TM->tmAveCharWidth)
|
||||||
|
{
|
||||||
|
TM->tmAveCharWidth = 1;
|
||||||
|
}
|
||||||
|
TM->tmMaxCharWidth = (FT_MulFix(Face->bbox.xMax - Face->bbox.xMin,
|
||||||
|
XScale) + 32) >> 6;
|
||||||
|
TM->tmWeight = pOS2->usWeightClass;
|
||||||
|
TM->tmOverhang = 0;
|
||||||
|
TM->tmDigitizedAspectX = 300;
|
||||||
|
TM->tmDigitizedAspectY = 300;
|
||||||
|
TM->tmFirstChar = pOS2->usFirstCharIndex;
|
||||||
|
TM->tmLastChar = pOS2->usLastCharIndex;
|
||||||
|
TM->tmDefaultChar = pOS2->usDefaultChar;
|
||||||
|
TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' ';
|
||||||
|
TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0;
|
||||||
|
TM->tmUnderlined = 0; /* entry in OS2 table */
|
||||||
|
TM->tmStruckOut = 0; /* entry in OS2 table */
|
||||||
|
|
||||||
|
/* Yes TPMF_FIXED_PITCH is correct; braindead api */
|
||||||
|
if (! FT_IS_FIXED_WIDTH(Face))
|
||||||
|
{
|
||||||
|
TM->tmPitchAndFamily = TMPF_FIXED_PITCH;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TM->tmPitchAndFamily = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (pOS2->panose[PAN_FAMILYTYPE_INDEX])
|
||||||
|
{
|
||||||
|
case PAN_FAMILY_SCRIPT:
|
||||||
|
TM->tmPitchAndFamily |= FF_SCRIPT;
|
||||||
|
break;
|
||||||
|
case PAN_FAMILY_DECORATIVE:
|
||||||
|
case PAN_FAMILY_PICTORIAL:
|
||||||
|
TM->tmPitchAndFamily |= FF_DECORATIVE;
|
||||||
|
break;
|
||||||
|
case PAN_FAMILY_TEXT_DISPLAY:
|
||||||
|
if (0 == TM->tmPitchAndFamily) /* fixed */
|
||||||
|
{
|
||||||
|
TM->tmPitchAndFamily = FF_MODERN;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (pOS2->panose[PAN_SERIFSTYLE_INDEX])
|
||||||
|
{
|
||||||
|
case PAN_SERIF_NORMAL_SANS:
|
||||||
|
case PAN_SERIF_OBTUSE_SANS:
|
||||||
|
case PAN_SERIF_PERP_SANS:
|
||||||
|
TM->tmPitchAndFamily |= FF_SWISS;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
TM->tmPitchAndFamily |= FF_ROMAN;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
TM->tmPitchAndFamily |= FF_DONTCARE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FT_IS_SCALABLE(Face))
|
||||||
|
{
|
||||||
|
TM->tmPitchAndFamily |= TMPF_VECTOR;
|
||||||
|
}
|
||||||
|
if (FT_IS_SFNT(Face))
|
||||||
|
{
|
||||||
|
TM->tmPitchAndFamily |= TMPF_TRUETYPE;
|
||||||
|
}
|
||||||
|
|
||||||
|
TM->tmCharSet = DEFAULT_CHARSET;
|
||||||
|
}
|
||||||
|
|
||||||
/*************************************************************
|
/*************************************************************
|
||||||
* IntGetOutlineTextMetrics
|
* IntGetOutlineTextMetrics
|
||||||
|
|
@ -711,8 +819,6 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
|
||||||
ANSI_STRING FamilyNameA, StyleNameA;
|
ANSI_STRING FamilyNameA, StyleNameA;
|
||||||
UNICODE_STRING FamilyNameW, StyleNameW, Regular;
|
UNICODE_STRING FamilyNameW, StyleNameW, Regular;
|
||||||
char *Cp;
|
char *Cp;
|
||||||
int Ascent, Descent;
|
|
||||||
TEXTMETRICW *TM;
|
|
||||||
|
|
||||||
Needed = sizeof(OUTLINETEXTMETRICW);
|
Needed = sizeof(OUTLINETEXTMETRICW);
|
||||||
|
|
||||||
|
|
@ -779,107 +885,7 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
|
||||||
|
|
||||||
Otm->otmSize = Needed;
|
Otm->otmSize = Needed;
|
||||||
|
|
||||||
if (0 == pOS2->usWinAscent + pOS2->usWinDescent)
|
FillTM(&Otm->otmTextMetrics, FontGDI->face, pOS2, pHori);
|
||||||
{
|
|
||||||
Ascent = pHori->Ascender;
|
|
||||||
Descent = -pHori->Descender;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Ascent = pOS2->usWinAscent;
|
|
||||||
Descent = pOS2->usWinDescent;
|
|
||||||
}
|
|
||||||
|
|
||||||
TM = &Otm->otmTextMetrics;
|
|
||||||
TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6;
|
|
||||||
TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6;
|
|
||||||
TM->tmInternalLeading = (FT_MulFix(Ascent + Descent
|
|
||||||
- FontGDI->face->units_per_EM, YScale) + 32) >> 6;
|
|
||||||
|
|
||||||
TM->tmHeight = TM->tmAscent + TM->tmDescent;
|
|
||||||
|
|
||||||
/* MSDN says:
|
|
||||||
* el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender)))
|
|
||||||
*/
|
|
||||||
TM->tmExternalLeading = max(0, (FT_MulFix(pHori->Line_Gap
|
|
||||||
- ((Ascent + Descent)
|
|
||||||
- (pHori->Ascender - pHori->Descender)),
|
|
||||||
YScale) + 32) >> 6);
|
|
||||||
|
|
||||||
TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6;
|
|
||||||
if (0 == TM->tmAveCharWidth)
|
|
||||||
{
|
|
||||||
TM->tmAveCharWidth = 1;
|
|
||||||
}
|
|
||||||
TM->tmMaxCharWidth = (FT_MulFix(FontGDI->face->bbox.xMax - FontGDI->face->bbox.xMin,
|
|
||||||
XScale) + 32) >> 6;
|
|
||||||
TM->tmWeight = pOS2->usWeightClass;
|
|
||||||
TM->tmOverhang = 0;
|
|
||||||
TM->tmDigitizedAspectX = 300;
|
|
||||||
TM->tmDigitizedAspectY = 300;
|
|
||||||
TM->tmFirstChar = pOS2->usFirstCharIndex;
|
|
||||||
TM->tmLastChar = pOS2->usLastCharIndex;
|
|
||||||
TM->tmDefaultChar = pOS2->usDefaultChar;
|
|
||||||
TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' ';
|
|
||||||
TM->tmItalic = (FontGDI->face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0;
|
|
||||||
TM->tmUnderlined = 0; /* entry in OS2 table */
|
|
||||||
TM->tmStruckOut = 0; /* entry in OS2 table */
|
|
||||||
|
|
||||||
/* Yes TPMF_FIXED_PITCH is correct; braindead api */
|
|
||||||
if (! FT_IS_FIXED_WIDTH(FontGDI->face))
|
|
||||||
{
|
|
||||||
TM->tmPitchAndFamily = TMPF_FIXED_PITCH;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
TM->tmPitchAndFamily = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (pOS2->panose[PAN_FAMILYTYPE_INDEX])
|
|
||||||
{
|
|
||||||
case PAN_FAMILY_SCRIPT:
|
|
||||||
TM->tmPitchAndFamily |= FF_SCRIPT;
|
|
||||||
break;
|
|
||||||
case PAN_FAMILY_DECORATIVE:
|
|
||||||
case PAN_FAMILY_PICTORIAL:
|
|
||||||
TM->tmPitchAndFamily |= FF_DECORATIVE;
|
|
||||||
break;
|
|
||||||
case PAN_FAMILY_TEXT_DISPLAY:
|
|
||||||
if (0 == TM->tmPitchAndFamily) /* fixed */
|
|
||||||
{
|
|
||||||
TM->tmPitchAndFamily = FF_MODERN;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
switch (pOS2->panose[PAN_SERIFSTYLE_INDEX])
|
|
||||||
{
|
|
||||||
case PAN_SERIF_NORMAL_SANS:
|
|
||||||
case PAN_SERIF_OBTUSE_SANS:
|
|
||||||
case PAN_SERIF_PERP_SANS:
|
|
||||||
TM->tmPitchAndFamily |= FF_SWISS;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
TM->tmPitchAndFamily |= FF_ROMAN;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
TM->tmPitchAndFamily |= FF_DONTCARE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FT_IS_SCALABLE(FontGDI->face))
|
|
||||||
{
|
|
||||||
TM->tmPitchAndFamily |= TMPF_VECTOR;
|
|
||||||
}
|
|
||||||
if (FT_IS_SFNT(FontGDI->face))
|
|
||||||
{
|
|
||||||
TM->tmPitchAndFamily |= TMPF_TRUETYPE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef TODO
|
|
||||||
TM->tmCharSet = DEFAULT_CHARSET;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Otm->otmFiller = 0;
|
Otm->otmFiller = 0;
|
||||||
memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT);
|
memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT);
|
||||||
|
|
@ -2548,7 +2554,7 @@ NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName)
|
||||||
BOOL
|
BOOL
|
||||||
STDCALL
|
STDCALL
|
||||||
NtGdiGetTextMetrics(HDC hDC,
|
NtGdiGetTextMetrics(HDC hDC,
|
||||||
LPTEXTMETRICW tm)
|
LPTEXTMETRICW tm)
|
||||||
{
|
{
|
||||||
PDC dc;
|
PDC dc;
|
||||||
PTEXTOBJ TextObj;
|
PTEXTOBJ TextObj;
|
||||||
|
|
@ -2557,6 +2563,7 @@ NtGdiGetTextMetrics(HDC hDC,
|
||||||
TEXTMETRICW SafeTm;
|
TEXTMETRICW SafeTm;
|
||||||
FT_Face Face;
|
FT_Face Face;
|
||||||
TT_OS2 *pOS2;
|
TT_OS2 *pOS2;
|
||||||
|
TT_HoriHeader *pHori;
|
||||||
ULONG Error;
|
ULONG Error;
|
||||||
|
|
||||||
if (NULL == tm)
|
if (NULL == tm)
|
||||||
|
|
@ -2573,7 +2580,7 @@ NtGdiGetTextMetrics(HDC hDC,
|
||||||
|
|
||||||
TextObj = TEXTOBJ_LockText(dc->w.hFont);
|
TextObj = TEXTOBJ_LockText(dc->w.hFont);
|
||||||
if (NULL != TextObj)
|
if (NULL != TextObj)
|
||||||
{
|
{
|
||||||
FontGDI = ObjToGDI(TextObj->Font, FONT);
|
FontGDI = ObjToGDI(TextObj->Font, FONT);
|
||||||
|
|
||||||
Face = FontGDI->face;
|
Face = FontGDI->face;
|
||||||
|
|
@ -2587,47 +2594,50 @@ NtGdiGetTextMetrics(HDC hDC,
|
||||||
IntUnLockFreeType;
|
IntUnLockFreeType;
|
||||||
if (0 != Error)
|
if (0 != Error)
|
||||||
{
|
{
|
||||||
DPRINT1("Error in setting pixel sizes: %u\n", Error);
|
DPRINT1("Error in setting pixel sizes: %u\n", Error);
|
||||||
Status = STATUS_UNSUCCESSFUL;
|
Status = STATUS_UNSUCCESSFUL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
|
memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
|
||||||
IntLockFreeType;
|
|
||||||
pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
|
Status = STATUS_SUCCESS;
|
||||||
IntUnLockFreeType;
|
IntLockFreeType;
|
||||||
if (NULL == pOS2)
|
pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2);
|
||||||
{
|
if (NULL == pOS2)
|
||||||
DPRINT1("Can't find OS/2 table - not TT font?\n");
|
{
|
||||||
Status = STATUS_UNSUCCESSFUL;
|
DPRINT1("Can't find OS/2 table - not TT font?\n");
|
||||||
}
|
Status = STATUS_INTERNAL_ERROR;
|
||||||
else
|
}
|
||||||
{
|
|
||||||
SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) >> 6;
|
pHori = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_hhea);
|
||||||
}
|
if (NULL == pHori)
|
||||||
SafeTm.tmAscent = (Face->size->metrics.ascender + 32) >> 6; // units above baseline
|
{
|
||||||
SafeTm.tmDescent = (32 - Face->size->metrics.descender) >> 6; // units below baseline
|
DPRINT1("Can't find HHEA table - not TT font?\n");
|
||||||
SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;
|
Status = STATUS_INTERNAL_ERROR;
|
||||||
SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) >> 6;
|
}
|
||||||
if (FT_IS_SFNT(FontGDI->face))
|
|
||||||
{
|
IntUnLockFreeType;
|
||||||
SafeTm.tmPitchAndFamily |= TMPF_TRUETYPE;
|
|
||||||
}
|
if (NT_SUCCESS(Status))
|
||||||
Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
|
{
|
||||||
|
FillTM(&SafeTm, FontGDI->face, pOS2, pHori);
|
||||||
|
Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
TEXTOBJ_UnlockText(dc->w.hFont);
|
TEXTOBJ_UnlockText(dc->w.hFont);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Status = STATUS_INVALID_HANDLE;
|
Status = STATUS_INVALID_HANDLE;
|
||||||
}
|
}
|
||||||
DC_UnlockDc(hDC);
|
DC_UnlockDc(hDC);
|
||||||
|
|
||||||
if(!NT_SUCCESS(Status))
|
if(!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
SetLastNtError(Status);
|
SetLastNtError(Status);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue