Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Retrieve tmAveCharWidth font metric

Browse source 
svn path=/trunk/; revision=6977
This commit is contained in:
Gé van Geldorp 2003-12-12 20:51:42 +00:00
parent b2854c757b
commit d59d3daf21
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsys/win32k/objects/text.c
View file

@ -16,7 +16,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.55 2003/12/08 20:58:44 chorns Exp $ */ /* $Id: text.c,v 1.56 2003/12/12 20:51:42 gvg Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
@ -30,6 +30,7 @@
#include <include/error.h> #include <include/error.h>
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <freetype/tttables.h>
#include "../eng/handle.h" #include "../eng/handle.h"
@ -917,6 +918,7 @@ NtGdiGetTextMetrics(HDC hDC,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
TEXTMETRICW SafeTm; TEXTMETRICW SafeTm;
FT_Face Face; FT_Face Face;
TT_OS2 *pOS2;
ULONG Error; ULONG Error;
dc = DC_LockDc(hDC); dc = DC_LockDc(hDC);
@ -947,6 +949,16 @@ NtGdiGetTextMetrics(HDC hDC,
else else
{ {
memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
if (NULL == pOS2)
{
DPRINT1("Can't find OS/2 table - not TT font?\n");
Status = STATUS_UNSUCCESSFUL;
}
else
{
SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) / 64;
}
SafeTm.tmAscent = (Face->size->metrics.ascender + 32) / 64; // units above baseline SafeTm.tmAscent = (Face->size->metrics.ascender + 32) / 64; // units above baseline
SafeTm.tmDescent = (- Face->size->metrics.descender + 32) / 64; // units below baseline SafeTm.tmDescent = (- Face->size->metrics.descender + 32) / 64; // units below baseline
SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent; SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;