Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Add support for arbitrary scaling matrices when rendering glyphs.
Partly fixes CORE-4657
Todo: handle glyph coordinates

svn path=/trunk/; revision=58414
This commit is contained in:
Timo Kreuzer 2013-03-03 14:43:53 +00:00
parent 74fa508092
commit 858bf16c6d
3 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/win32ss/drivers/font/ftfd/freetype.def
View file

@ -27,3 +27,4 @@ EXPORTS
FT_Set_Pixel_Sizes FT_Set_Pixel_Sizes
FT_Vector_Transform FT_Vector_Transform
FT_Vector_Unit FT_Vector_Unit
FT_Set_Transform

1
reactos/win32ss/drivers/font/ftfd/ftfd.spec
View file

@ -26,3 +26,4 @@
@ cdecl FT_Set_Pixel_Sizes() @ cdecl FT_Set_Pixel_Sizes()
@ cdecl FT_Vector_Transform() @ cdecl FT_Vector_Transform()
@ cdecl FT_Vector_Unit() @ cdecl FT_Vector_Unit()
@ cdecl FT_Set_Transform()

41
reactos/win32ss/gdi/ntgdi/freetype.c
View file

@ -158,6 +158,39 @@ InitFontSupport(VOID)
return TRUE; return TRUE;
} }
VOID
FtSetCoordinateTransform(
FT_Face face,
PDC pdc)
{
FT_Matrix ftmatrix;
PMATRIX pmx;
FLOATOBJ efTemp;
/* Get the DC's world-to-device transformation matrix */
pmx = DC_pmxWorldToDevice(pdc);
/* Create a freetype matrix, by converting to 16.16 fixpoint format */
efTemp = pmx->efM11;
FLOATOBJ_MulLong(&efTemp, 0x00010000);
ftmatrix.xx = FLOATOBJ_GetLong(&efTemp);
efTemp = pmx->efM12;
FLOATOBJ_MulLong(&efTemp, 0x00010000);
ftmatrix.xy = FLOATOBJ_GetLong(&efTemp);
efTemp = pmx->efM21;
FLOATOBJ_MulLong(&efTemp, 0x00010000);
ftmatrix.yx = FLOATOBJ_GetLong(&efTemp);
efTemp = pmx->efM22;
FLOATOBJ_MulLong(&efTemp, 0x00010000);
ftmatrix.yy = FLOATOBJ_GetLong(&efTemp);
/* Set the transformation matrix */
FT_Set_Transform(face, &ftmatrix, 0);
}
/* /*
* IntLoadSystemFonts * IntLoadSystemFonts
* *
@ -1552,6 +1585,7 @@ ftGdiGetGlyphOutline(
/* FIXME: Should set character height if neg */ /* FIXME: Should set character height if neg */
// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? // (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
// dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); // dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
// FtSetCoordinateTransform(face, dc);
TEXTOBJ_UnlockText(TextObj); TEXTOBJ_UnlockText(TextObj);
@ -2152,6 +2186,8 @@ TextIntGetTextExtentPoint(PDC dc,
DPRINT1("Error in setting pixel sizes: %u\n", error); DPRINT1("Error in setting pixel sizes: %u\n", error);
} }
FtSetCoordinateTransform(face, dc);
use_kerning = FT_HAS_KERNING(face); use_kerning = FT_HAS_KERNING(face);
previous = 0; previous = 0;
@ -2434,6 +2470,7 @@ ftGdiGetTextMetricsW(
/* FIXME: Should set character height if neg */ /* FIXME: Should set character height if neg */
(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
FtSetCoordinateTransform(Face, dc);
IntUnLockFreeType; IntUnLockFreeType;
if (0 != Error) if (0 != Error)
{ {
@ -3291,6 +3328,8 @@ GreExtTextOutW(
goto fail; goto fail;
} }
FtSetCoordinateTransform(face, dc);
/* /*
* Process the vertical alignment and determine the yoff. * Process the vertical alignment and determine the yoff.
*/ */
@ -3827,6 +3866,7 @@ NtGdiGetCharABCWidthsW(
/* FIXME: Should set character height if neg */ /* FIXME: Should set character height if neg */
(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
FtSetCoordinateTransform(face, dc);
for (i = FirstChar; i < FirstChar+Count; i++) for (i = FirstChar; i < FirstChar+Count; i++)
{ {
@ -3994,6 +4034,7 @@ NtGdiGetCharWidthW(
/* FIXME: Should set character height if neg */ /* FIXME: Should set character height if neg */
(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
FtSetCoordinateTransform(face, dc);
for (i = FirstChar; i < FirstChar+Count; i++) for (i = FirstChar; i < FirstChar+Count; i++)
{ {