* PURPOSE: FreeType font engine interface
* PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers.
* Copyright 2006 Dmitry Timoshkov for CodeWeavers.
- * Copyright 2016-2017 Katayama Hirofumi MZ.
+ * Copyright 2016-2018 Katayama Hirofumi MZ.
*/
/** Includes ******************************************************************/
{ SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} }
};
+#ifndef CP_OEMCP
+ #define CP_OEMCP 1
+ #define CP_MACCP 2
+#endif
+
+/* Get charset from specified codepage.
+ g_FontTci is used also in TranslateCharsetInfo. */
+BYTE FASTCALL IntCharSetFromCodePage(UINT uCodePage)
+{
+ UINT i;
+
+ if (uCodePage == CP_OEMCP)
+ return OEM_CHARSET;
+
+ if (uCodePage == CP_MACCP)
+ return MAC_CHARSET;
+
+ for (i = 0; i < MAXTCIINDEX; ++i)
+ {
+ if (g_FontTci[i].ciACP == 0)
+ continue;
+
+ if (g_FontTci[i].ciACP == uCodePage)
+ return g_FontTci[i].ciCharset;
+ }
+
+ return DEFAULT_CHARSET;
+}
+
/* list head */
static RTL_STATIC_LIST_HEAD(g_FontSubstListHead);
CharSets[FONTSUBST_TO] = (BYTE)_wtoi(pch + 1);
}
+ /* is it identical? */
+ if (RtlEqualUnicodeString(&FromW, &ToW, TRUE) &&
+ CharSets[FONTSUBST_FROM] == CharSets[FONTSUBST_TO])
+ {
+ RtlFreeUnicodeString(&FromW);
+ RtlFreeUnicodeString(&ToW);
+ continue;
+ }
+
/* allocate an entry */
pEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONTSUBST_ENTRY), TAG_FONT);
if (pEntry == NULL)
return FW_NORMAL;
}
+static FT_Error
+IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight);
+
static INT FASTCALL
IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont,
PSHARED_FACE SharedFace, FT_Long FontIndex, INT CharSetIndex)
DPRINT("Num glyphs: %d\n", Face->num_glyphs);
DPRINT("CharSet: %d\n", FontGDI->CharSet);
+ IntLockFreeType();
+ IntRequestFontSize(NULL, FontGDI, 0, 0);
+ IntUnLockFreeType();
+
/* Add this font resource to the font table */
Entry->Font = FontGDI;
Entry->NotEnum = (Characteristics & FR_NOT_ENUM);
for(i = 0; i < ft_face->num_charmaps; i++)
{
- if(ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL)
+ if (ft_face->charmaps[i]->platform_id == TT_PLATFORM_MICROSOFT &&
+ ft_face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL)
+ {
return TRUE;
+ }
}
return FALSE;
}
-
static void FASTCALL
FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI,
TT_OS2 *pOS2, TT_HoriHeader *pHori,
Descent = pOS2->usWinDescent;
}
-#if 0 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */
- TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6;
- TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6;
-#else /* This (ros) code was previously affected by a FreeType bug, but it works now */
- TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* Units above baseline */
- TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* Units below baseline */
-#endif
- TM->tmInternalLeading = (FT_MulFix(Ascent + Descent - Face->units_per_EM, YScale) + 32) >> 6;
-
+ if (FontGDI->Magic != FONTGDI_MAGIC)
+ {
+ IntRequestFontSize(NULL, FontGDI, 0, 0);
+ }
+ TM->tmAscent = FontGDI->tmAscent;
+ TM->tmDescent = FontGDI->tmDescent;
TM->tmHeight = TM->tmAscent + TM->tmDescent;
+ TM->tmInternalLeading = FontGDI->tmInternalLeading;
/* MSDN says:
* el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender)))
FONTGDI *FontGDI;
NTSTATUS status;
- Entry = Head->Flink;
- while (Entry != Head)
+ for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink)
{
CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
}
RtlFreeUnicodeString(&EntryFaceNameW);
- Entry = Entry->Flink;
}
return NULL;
ASSERT_FREETYPE_LOCK_HELD();
- CurrentEntry = g_FontCacheListHead.Flink;
- while (CurrentEntry != &g_FontCacheListHead)
+ for (CurrentEntry = g_FontCacheListHead.Flink;
+ CurrentEntry != &g_FontCacheListHead;
+ CurrentEntry = CurrentEntry->Flink)
{
FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry);
if ((FontEntry->Face == Face) &&
(FontEntry->RenderMode == RenderMode) &&
(SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx)))
break;
- CurrentEntry = CurrentEntry->Flink;
}
if (CurrentEntry == &g_FontCacheListHead)
return needed;
}
-static INT
-IntRequestFontSize(PDC dc, FT_Face face, LONG Width, LONG Height)
+static FT_Error
+IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight)
{
+ FT_Error error;
FT_Size_RequestRec req;
+ FT_Face face = FontGDI->SharedFace->Face;
+ TT_OS2 *pOS2;
+ TT_HoriHeader *pHori;
+ FT_WinFNT_HeaderRec WinFNT;
+ LONG Ascent, Descent, Sum, EmHeight64;
+
+ lfWidth = abs(lfWidth);
+ if (lfHeight == 0)
+ {
+ if (lfWidth == 0)
+ {
+ DPRINT("lfHeight and lfWidth are zero.\n");
+ lfHeight = -16;
+ }
+ else
+ {
+ lfHeight = lfWidth;
+ }
+ }
- if (Width < 0)
- Width = -Width;
+ if (lfHeight == -1)
+ lfHeight = -2;
+
+ ASSERT_FREETYPE_LOCK_HELD();
+ pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2);
+ pHori = (TT_HoriHeader *)FT_Get_Sfnt_Table(face, FT_SFNT_HHEA);
- if (Height < 0)
+ if (!pOS2 || !pHori)
{
- Height = -Height;
+ error = FT_Get_WinFNT_Header(face, &WinFNT);
+ if (error)
+ return error;
+
+ FontGDI->tmHeight = WinFNT.pixel_height;
+ FontGDI->tmAscent = WinFNT.ascent;
+ FontGDI->tmDescent = FontGDI->tmHeight - FontGDI->tmAscent;
+ FontGDI->tmInternalLeading = WinFNT.internal_leading;
+ FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading;
+ FontGDI->EmHeight = max(FontGDI->EmHeight, 1);
+ FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX);
+ FontGDI->Magic = FONTGDI_MAGIC;
+
+ req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
+ req.width = 0;
+ req.height = (FT_Long)(FontGDI->EmHeight << 6);
+ req.horiResolution = 0;
+ req.vertResolution = 0;
+ return FT_Request_Size(face, &req);
}
- if (Height == 0)
+
+ if (lfHeight > 0)
{
- Height = dc->ppdev->devinfo.lfDefaultFont.lfHeight;
+ /* case (A): lfHeight is positive */
+ Sum = pOS2->usWinAscent + pOS2->usWinDescent;
+ if (Sum == 0)
+ {
+ Ascent = pHori->Ascender;
+ Descent = -pHori->Descender;
+ Sum = Ascent + Descent;
+ }
+ else
+ {
+ Ascent = pOS2->usWinAscent;
+ Descent = pOS2->usWinDescent;
+ }
+
+ FontGDI->tmAscent = FT_MulDiv(lfHeight, Ascent, Sum);
+ FontGDI->tmDescent = FT_MulDiv(lfHeight, Descent, Sum);
+ FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent;
+ FontGDI->tmInternalLeading = FontGDI->tmHeight - FT_MulDiv(lfHeight, face->units_per_EM, Sum);
}
- if (Height == 0)
+ else if (lfHeight < 0)
{
- Height = Width;
+ /* case (B): lfHeight is negative */
+ FontGDI->tmAscent = FT_MulDiv(-lfHeight, pOS2->usWinAscent, face->units_per_EM);
+ FontGDI->tmDescent = FT_MulDiv(-lfHeight, pOS2->usWinDescent, face->units_per_EM);
+ FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent;
+ FontGDI->tmInternalLeading = FontGDI->tmHeight + lfHeight;
}
- if (Height < 1)
- Height = 1;
+ FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading;
+ FontGDI->EmHeight = max(FontGDI->EmHeight, 1);
+ FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX);
+ FontGDI->Magic = FONTGDI_MAGIC;
- if (Width > 0xFFFFU)
- Width = 0xFFFFU;
- if (Height > 0xFFFFU)
- Height = 0xFFFFU;
+ if (lfHeight > 0)
+ EmHeight64 = (FontGDI->EmHeight << 6) + 31;
+ else
+ EmHeight64 = (FontGDI->EmHeight << 6);
req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
- req.width = (FT_Long)(Width << 6);
- req.height = (FT_Long)(Height << 6);
+ req.width = 0;
+ req.height = EmHeight64;
req.horiResolution = 0;
req.vertResolution = 0;
return FT_Request_Size(face, &req);
for (n = 0; n < face->num_charmaps; n++)
{
charmap = face->charmaps[n];
- DPRINT("Found charmap encoding: %i\n", charmap->encoding);
- if (charmap->encoding != 0)
+ if (charmap->encoding == FT_ENCODING_UNICODE)
{
found = charmap;
break;
}
}
if (!found)
+ {
+ for (n = 0; n < face->num_charmaps; n++)
+ {
+ charmap = face->charmaps[n];
+ if (charmap->encoding == FT_ENCODING_MS_SYMBOL)
+ {
+ found = charmap;
+ break;
+ }
+ }
+ }
+ if (!found)
{
DPRINT1("WARNING: Could not find desired charmap!\n");
}
else
{
+ DPRINT("Found charmap encoding: %i\n", found->encoding);
error = FT_Set_Charmap(face, found);
if (error)
{
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
- error = IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
if (bDoLock)
IntUnLockFreeType();
return TRUE;
}
+static inline FT_UInt FASTCALL
+get_glyph_index_symbol(FT_Face ft_face, UINT glyph)
+{
+ FT_UInt ret;
+
+ if (glyph < 0x100) glyph += 0xf000;
+ /* there are a number of old pre-Unicode "broken" TTFs, which
+ do have symbols at U+00XX instead of U+f0XX */
+ if (!(ret = FT_Get_Char_Index(ft_face, glyph)))
+ ret = FT_Get_Char_Index(ft_face, glyph - 0xf000);
+
+ return ret;
+}
+
+static inline FT_UInt FASTCALL
+get_glyph_index(FT_Face ft_face, UINT glyph)
+{
+ FT_UInt ret;
+
+ if (face_has_symbol_charmap(ft_face))
+ {
+ ret = get_glyph_index_symbol(ft_face, glyph);
+ if (ret != 0)
+ return ret;
+ }
+
+ return FT_Get_Char_Index(ft_face, glyph);
+}
+
+static inline FT_UInt FASTCALL
+get_glyph_index_flagged(FT_Face face, FT_ULong code, DWORD indexed_flag, DWORD flags)
+{
+ FT_UInt glyph_index;
+ if (flags & indexed_flag)
+ {
+ glyph_index = code;
+ }
+ else
+ {
+ glyph_index = get_glyph_index(face, code);
+ }
+ return glyph_index;
+}
/*
* Based on WineEngGetGlyphOutline
TEXTOBJ_UnlockText(TextObj);
- if (iFormat & GGO_GLYPH_INDEX)
- {
- glyph_index = wch;
- iFormat &= ~GGO_GLYPH_INDEX;
- }
- else glyph_index = FT_Get_Char_Index(ft_face, wch);
+ glyph_index = get_glyph_index_flagged(ft_face, wch, GGO_GLYPH_INDEX, iFormat);
+ iFormat &= ~GGO_GLYPH_INDEX;
if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2)
load_flags |= FT_LOAD_NO_BITMAP;
IntLockFreeType();
- /* Scaling transform */
- /*if (aveWidth)*/
+ /* Width scaling transform */
+ if (widthRatio != 1.0)
{
+ FT_Matrix scaleMat;
+ scaleMat.xx = FT_FixedFromFloat(widthRatio);
+ scaleMat.xy = 0;
+ scaleMat.yx = 0;
+ scaleMat.yy = FT_FixedFromFloat(1.0);
+
+ FT_Matrix_Multiply(&scaleMat, &transMat);
+ needsTransform = TRUE;
+ }
+ /* World transform */
+ {
FT_Matrix ftmatrix;
FLOATOBJ efTemp;
-
PMATRIX pmx = DC_pmxWorldToDevice(dc);
/* Create a freetype matrix, by converting to 16.16 fixpoint format */
FLOATOBJ_MulLong(&efTemp, 0x00010000);
ftmatrix.yy = FLOATOBJ_GetLong(&efTemp);
- FT_Matrix_Multiply(&ftmatrix, &transMat);
- needsTransform = TRUE;
+ if (memcmp(&ftmatrix, &identityMat, sizeof(identityMat)) != 0)
+ {
+ FT_Matrix_Multiply(&ftmatrix, &transMat);
+ needsTransform = TRUE;
+ }
}
/* Rotation transform */
for (i = 0; i < Count; i++)
{
- if (fl & GTEF_INDICES)
- glyph_index = *String;
- else
- glyph_index = FT_Get_Char_Index(face, *String);
+ glyph_index = get_glyph_index_flagged(face, *String, GTEF_INDICES, fl);
if (EmuBold || EmuItalic)
realglyph = NULL;
previous = glyph_index;
String++;
}
- ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */
- descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */
+ ASSERT(FontGDI->Magic == FONTGDI_MAGIC);
+ ascender = FontGDI->tmAscent; /* Units above baseline */
+ descender = FontGDI->tmDescent; /* Units below baseline */
IntUnLockFreeType();
Size->cx = (TotalWidth + 32) >> 6;
FontGDI = ObjToGDI(TextObj->Font, FONT);
Face = FontGDI->SharedFace->Face;
+
IntLockFreeType();
- Error = IntRequestFontSize(dc, Face, plf->lfWidth, plf->lfHeight);
+ Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc));
IntUnLockFreeType();
+
if (0 != Error)
{
DPRINT1("Error in setting pixel sizes: %u\n", Error);
ASSERT(Otm);
ASSERT(LogFont);
- /* FIXME: Aspect Penalty 30 */
/* FIXME: IntSizeSynth Penalty 20 */
/* FIXME: SmallPenalty Penalty 1 */
/* FIXME: FaceNameSubst Penalty 500 */
Byte = (LogFont->lfPitchAndFamily & 0x0F);
if (Byte == DEFAULT_PITCH)
Byte = VARIABLE_PITCH;
- if (Byte == FIXED_PITCH)
+ if ((Byte & FIXED_PITCH) || (Byte & MONO_FONT))
{
if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)
{
Penalty += 15000;
}
}
- if (Byte == VARIABLE_PITCH)
+ if (Byte & VARIABLE_PITCH)
{
if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH))
{
Byte = (LogFont->lfPitchAndFamily & 0xF0);
if (Byte != FF_DONTCARE)
{
- if (Byte != (TM->tmPitchAndFamily & 0xF0))
+ if (Byte & FF_MODERN)
+ {
+ if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)
+ {
+ /* FixedPitch Penalty 15000 */
+ /* Requested a fixed pitch font, but the candidate is a
+ variable pitch font. */
+ Penalty += 15000;
+ }
+ }
+
+ if ((Byte & FF_ROMAN) || (Byte & FF_SWISS))
+ {
+ if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH))
+ {
+ /* PitchVariable Penalty 350 */
+ /* Requested a variable pitch font, but the candidate is not a
+ variable pitch font. */
+ Penalty += 350;
+ }
+ }
+
+#define FF_MASK (FF_DECORATIVE | FF_SCRIPT | FF_SWISS)
+ if ((Byte & FF_MASK) != (TM->tmPitchAndFamily & FF_MASK))
{
/* Family Penalty 9000 */
/* Requested a family, but the candidate's family is different. */
Penalty += 9000;
}
+#undef FF_MASK
+
if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE)
{
/* FamilyUnknown Penalty 8000 */
Penalty += 2;
}
+ if (TM->tmAveCharWidth >= 5 && TM->tmHeight >= 5)
+ {
+ if (TM->tmAveCharWidth / TM->tmHeight >= 3)
+ {
+ /* Aspect Penalty 30 */
+ /* The aspect rate is >= 3. It seems like a bad font. */
+ Penalty += ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30;
+ }
+ else if (TM->tmHeight / TM->tmAveCharWidth >= 3)
+ {
+ /* Aspect Penalty 30 */
+ /* The aspect rate is >= 3. It seems like a bad font. */
+ Penalty += ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30;
+ }
+ }
+
if (Penalty < 200)
{
DPRINT("WARNING: Penalty:%ld < 200: RequestedNameW:%ls, "
Otm = ExAllocatePoolWithTag(PagedPool, OldOtmSize, GDITAG_TEXT);
/* get the FontObj of lowest penalty */
- Entry = Head->Flink;
- while (Entry != Head)
+ for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink)
{
CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
- Entry = Entry->Flink;
FontGDI = CurrentEntry->Font;
ASSERT(FontGDI);
/* update FontObj if lowest penalty */
if (Otm)
{
+ IntLockFreeType();
+ IntRequestFontSize(NULL, FontGDI, LogFont->lfWidth, LogFont->lfHeight);
+ IntUnLockFreeType();
+
OtmSize = IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm);
if (!OtmSize)
continue;
}
else
{
+ UNICODE_STRING FaceName;
PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT);
+
+ IntLockFreeType();
+ IntRequestFontSize(NULL, FontGdi, pLogFont->lfWidth, pLogFont->lfHeight);
+ IntUnLockFreeType();
+
+ RtlInitUnicodeString(&FaceName, NULL);
+ IntGetFontLocalizedName(&FaceName, FontGdi->SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID);
+
+ /* truncated copy */
+ FaceName.Length = (USHORT)min(FaceName.Length, (LF_FACESIZE - 1) * sizeof(WCHAR));
+ FaceName.MaximumLength = (USHORT)(FaceName.Length + sizeof(UNICODE_NULL));
+ RtlCopyMemory(TextObj->FaceName, FaceName.Buffer, FaceName.MaximumLength);
+
+ RtlFreeUnicodeString(&FaceName);
+
// Need hdev, when freetype is loaded need to create DEVOBJ for
// Consumer and Producer.
TextObj->Font->iUniq = 1; // Now it can be cached.
goto Cleanup;
}
+ /* NOTE: Don't trust face->size->metrics.ascender and descender values. */
if (dc->pdcattr->iGraphicsMode == GM_ADVANCED)
{
pmxWorldToDevice = DC_pmxWorldToDevice(dc);
FtSetCoordinateTransform(face, pmxWorldToDevice);
- fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22);
- fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22);
+ fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6;
+ fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6;
}
else
{
pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault;
FtSetCoordinateTransform(face, pmxWorldToDevice);
- fixAscender = face->size->metrics.ascender;
- fixDescender = face->size->metrics.descender;
+ fixAscender = FontGDI->tmAscent << 6;
+ fixDescender = FontGDI->tmDescent << 6;
}
/*
* Process the vertical alignment and determine the yoff.
*/
-
- if (pdcattr->lTextAlign & TA_BASELINE)
+#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM)
+ if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE)
yoff = 0;
- else if (pdcattr->lTextAlign & TA_BOTTOM)
- yoff = -fixDescender >> 6;
+ else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM)
+ yoff = -(fixDescender >> 6);
else /* TA_TOP */
yoff = fixAscender >> 6;
+#undef VALIGN_MASK
use_kerning = FT_HAS_KERNING(face);
previous = 0;
for (i = iStart; i < Count; i++)
{
- if (fuOptions & ETO_GLYPH_INDEX)
- glyph_index = *TempText;
- else
- glyph_index = FT_Get_Char_Index(face, *TempText);
+ glyph_index = get_glyph_index_flagged(face, *TempText, ETO_GLYPH_INDEX, fuOptions);
if (EmuBold || EmuItalic)
realglyph = NULL;
BackgroundLeft = (RealXStart + 32) >> 6;
for (i = 0; i < Count; ++i)
{
- if (fuOptions & ETO_GLYPH_INDEX)
- glyph_index = String[i];
- else
- glyph_index = FT_Get_Char_Index(face, String[i]);
+ glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions);
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error)
DestRect.left = BackgroundLeft;
DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6;
DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6);
- DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6);
+ DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6);
MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
{
BackgroundLeft = (RealXStart + 32) >> 6;
for (i = 0; i < Count; ++i)
{
- if (fuOptions & ETO_GLYPH_INDEX)
- glyph_index = String[i];
- else
- glyph_index = FT_Get_Char_Index(face, String[i]);
+ glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions);
if (EmuBold || EmuItalic)
realglyph = NULL;
DestRect.left = BackgroundLeft;
DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6;
DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6);
- DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6);
+ DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6);
if (dc->dctype == DCTYPE_DIRECT)
MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
IntLockFreeType();
- IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(face, pmxWorldToDevice);
for (i = FirstChar; i < FirstChar+Count; i++)
if (Safepwch)
{
- if (fl & GCABCW_INDICES)
- glyph_index = Safepwch[i - FirstChar];
- else
- glyph_index = FT_Get_Char_Index(face, Safepwch[i - FirstChar]);
+ glyph_index = get_glyph_index_flagged(face, Safepwch[i - FirstChar], GCABCW_INDICES, fl);
}
else
{
- if (fl & GCABCW_INDICES)
- glyph_index = i;
- else
- glyph_index = FT_Get_Char_Index(face, i);
+ glyph_index = get_glyph_index_flagged(face, i, GCABCW_INDICES, fl);
}
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
IntLockFreeType();
- IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(face, pmxWorldToDevice);
for (i = FirstChar; i < FirstChar+Count; i++)
{
if (Safepwc)
{
- if (fl & GCW_INDICES)
- glyph_index = Safepwc[i - FirstChar];
- else
- glyph_index = FT_Get_Char_Index(face, Safepwc[i - FirstChar]);
+ glyph_index = get_glyph_index_flagged(face, Safepwc[i - FirstChar], GCW_INDICES, fl);
}
else
{
- if (fl & GCW_INDICES)
- glyph_index = i;
- else
- glyph_index = FT_Get_Char_Index(face, i);
+ glyph_index = get_glyph_index_flagged(face, i, GCW_INDICES, fl);
}
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (!fl)
if (FT_IS_SFNT(Face))
{
TT_OS2 *pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
- DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(Face, pOS2->usDefaultChar) : 0);
+ DefChar = (pOS2->usDefaultChar ? get_glyph_index(Face, pOS2->usDefaultChar) : 0);
}
else
{
for (i = 0; i < cwc; i++)
{
- Buffer[i] = FT_Get_Char_Index(FontGDI->SharedFace->Face, Safepwc[i]);
+ Buffer[i] = get_glyph_index(FontGDI->SharedFace->Face, Safepwc[i]);
if (Buffer[i] == 0)
{
Buffer[i] = DefChar;