Merge pull request #5732 from livecodeian/bugfix-20035

runrevmark · web-flow · commit c9dd00c5e88e · 2017-08-08T15:06:42.000+01:00
[[ Bug 20035 ]] Implement Win32 font listing using DirectWrite
diff --git a/docs/notes/bugfix-20035.md b/docs/notes/bugfix-20035.md
@@ -0,0 +1 @@
+# Fix incorrect fontnames listed on Windows
diff --git a/engine/src/w32flst.cpp b/engine/src/w32flst.cpp
@@ -368,45 +368,12 @@ void MCFontlist::freeprinterfonts()
 	while (tmp != fonts);
 }
 
-// SN-2015-03-02: [[ Bug 14661 ]] New context for the
-//  font listing callback function.
-//  An array is used to keep track of the font already
-//  added (hash comparison faster than that looking for
-//  a string in a list)
-struct MCFontListing
+static compare_t _MCFontListCompareNames(const MCValueRef *p_left, const MCValueRef *p_right)
 {
-	MCArrayRef array;
-	MCListRef list;
-};
+	MCAssert(MCValueGetTypeCode(*p_left) == kMCValueTypeCodeString);
+	MCAssert(MCValueGetTypeCode(*p_right) == kMCValueTypeCodeString);
 
-int CALLBACK fontnames_FontFamProc(const LOGFONTW * lpelf,
-								   const TEXTMETRICW * lpntm,
-								   DWORD FontType, LPARAM lParam)
-{
-	// SN-2015-03-02: [[ Bug 14661 ]] A MCFontListing struct
-	//  is now passed to the callback functions.
-	MCFontListing* t_fontlist = (MCFontListing*)lParam;
-	MCNewAutoNameRef t_name;
-
-	size_t t_length;
-	if (StringCchLengthW(lpelf->lfFaceName, LF_FACESIZE, &t_length) != S_OK)
-		return False;
-
-	if (!MCNameCreateWithChars(lpelf->lfFaceName, t_length, &t_name))
-		return False;
-
-	// SN-2015-03-02: [[ Bug 14661 ]] Skip names that 
-	//  we have already added to the array, comparing
-	//  full name to full name. That avoid to skip
-	//  "Segoe UI" if "Segoe UI Light" has already been 
-	//  loaded, like it was with MCStringContains
-	MCValueRef t_value;
-	if (MCArrayFetchValue(t_fontlist->array, true, *t_name, t_value))
-		return True;
-
-	// Add the font name in the array, and in the list.
-	MCArrayStoreValue(t_fontlist -> array, true, *t_name, kMCEmptyString);
-	return MCListAppend(t_fontlist->list, MCNameGetString(*t_name)) ? True : False;
+	return MCStringCompareTo(MCStringRef(*p_left), MCStringRef(*p_right), kMCStringOptionCompareExact);
 }
 
 bool MCFontlist::getfontnames(MCStringRef p_type, MCListRef& r_names)
@@ -417,75 +384,29 @@ bool MCFontlist::getfontnames(MCStringRef p_type, MCListRef& r_names)
 		return true;
 	}
 
-	MCScreenDC *pms = (MCScreenDC *)MCscreen;
-	HDC hdc;
-#ifdef _DESKTOP
-	// MM-2013-09-13:: [[ RefactorGraphics ]] Tweak to get things compiling for server.
-	if (MCStringIsEqualToCString(p_type, "printer", kMCCompareCaseless))
-		hdc = static_cast<MCWindowsPrinter *>(MCsystemprinter) -> GetDC();
-	else
-#endif
-		hdc = pms->getsrchdc();
-	LOGFONTW lf;
-	lf.lfCharSet = DEFAULT_CHARSET;
-	lf.lfFaceName[0] = '\0';
-	lf.lfPitchAndFamily = 0;
-
-	// SN-2015-03-02: [[ Bug 14661 ]] Initialise the
-	//  MCFontListing members.
-	bool t_success;
-	MCFontListing t_fontlist = {nil, nil};
-
-	t_success = MCArrayCreateMutable(t_fontlist.array)
-				&& MCListCreateMutable('\n', t_fontlist.list);
-
-	if (t_success)
-		t_success = EnumFontFamiliesExW(hdc, &lf, (FONTENUMPROCW)fontnames_FontFamProc, (LPARAM)(&t_fontlist), 0) == True;
-
-	if (t_success)
-		t_success = MCListCopy(t_fontlist.list, r_names);
-
-	// SN-2015-03-02: [[ Bug 14661 ]] Cleanup the
-	//  MCFontListing members.
-	MCValueRelease(t_fontlist . array);
-	MCValueRelease(t_fontlist . list);
-
-	return t_success;
-}
+	MCAutoProperListRef t_names;
+	if (!MCGFontGetPlatformFontList(&t_names))
+		return false;
 
-typedef struct
-{
-	bool success;
-	MCListRef list;
-	uint2 *sizes;
-	uindex_t size_count;
-} fontsizes_context;
-
-int CALLBACK fontsizes_FontFamProc(const ENUMLOGFONTW* lpelf,
-								   const NEWTEXTMETRICW* lpntm,
-								   DWORD FontType, LPARAM lParam)
-{
-	fontsizes_context *context = (fontsizes_context*)lParam;
-	if (!(FontType & TRUETYPE_FONTTYPE))
-	{ //if not true-type font
-		uint2 size = uint2((((lpelf->elfLogFont.lfHeight * 72)
-		               / SCREEN_WIDTH_FOR_FONT_USE) * 8 / 7));
-		for (uindex_t i = 0; i < context->size_count; i++)
-			if (context->sizes[i] == size)
-				return True; //return to callback function again
-		context->success = MCMemoryResizeArray(context->size_count + 1, context->sizes, context->size_count);
-		if (context->success)
-		{
-			context->sizes[context->size_count - 1] = size;
-			context->success = MCListAppendInteger(context->list, size);
-		}
-		return context->success ? True : False;
-	}
-	else
-	{ //if true-type font, size is always 0.
-		context->success = MCListAppendInteger(context->list, 0);
-		return False; //stop right here. no more callback function
+	MCAssert(MCProperListIsListOfType(*t_names, kMCValueTypeCodeString));
+	// sort list (of strings) alphabetically
+	if (!MCProperListSort(*t_names, false, _MCFontListCompareNames))
+		return false;
+
+	MCAutoListRef t_name_list;
+	if (!MCListCreateMutable('\n', &t_name_list))
+		return false;
+
+	uintptr_t t_index = 0;
+	MCValueRef t_element = nil;
+	while (MCProperListIterate(*t_names, t_index, t_element))
+	{
+		if (!MCListAppend(*t_name_list, t_element))
+			return false;
 	}
+
+	r_names = t_name_list.Take();
+	return true;
 }
 
 bool MCFontlist::getfontsizes(MCStringRef p_fname, MCListRef& r_sizes)
@@ -499,76 +420,12 @@ bool MCFontlist::getfontsizes(MCStringRef p_fname, MCListRef& r_sizes)
 	if (!MCListCreateMutable('\n', &t_list))
 		return false;
 
-	fontsizes_context context;
-	context.list = *t_list;
-	context.success = true;
-	context.sizes = nil;
-	context.size_count = 0;
-
-	MCAutoStringRefAsWString t_fname_wstr;
-	if (!t_fname_wstr.Lock(p_fname))
-		return false;
-
-	MCScreenDC *pms = (MCScreenDC *)MCscreen;
-	HDC hdc = pms->getsrchdc();
-
-	LOGFONTW lf;
-	lf.lfCharSet = DEFAULT_CHARSET;
-	lf.lfPitchAndFamily = 0;
-
-	// Copy the font family name
-	if (StringCchCopyW(lf.lfFaceName, LF_FACESIZE, *t_fname_wstr) != S_OK)
+	// All DirectWrite fonts are scalable, so size is always 0.
+	if (!MCListAppendInteger(*t_list, 0))
 		return false;
 
-	EnumFontFamiliesExW(hdc, &lf, (FONTENUMPROCW)fontsizes_FontFamProc, (LPARAM)&context, 0);
-
-	MCMemoryDeleteArray(context.sizes);
-	if (context.success)
-		return MCListCopy(*t_list, r_sizes);
-
-	return false;
-}
-
-#ifdef FOR_TRUE_TYPE_ONLY
-static uint2 nfonts;
-static MCListRef s_style_list;
-enum FontQueryType {
-    FQ_NAMES,
-    FQ_SIZES,
-    FQ_STYLES,
-};
-
-int CALLBACK MyFontFamProc(ENUMLOGFONTA FAR* lpelf,
-                           NEWTEXTMETRICA FAR* lpntm,
-                           int FontType, LPARAM lParam)
-{
-	switch (lParam)
-	{
-	case FQ_STYLES:
-		{
-			if (!(FontType & TRUETYPE_FONTTYPE))
-			{ //not true-type font
-				/* UNCHECKED */ MCListAppend(s_style_list, MCN_plain) &&
-					MCListAppend(s_style_list, MCN_bold) &&
-					MCListAppend(s_style_list, MCN_italic) &&
-					MCListAppend(s_style_list, MCN_bold_italic);
-				return False;  //stop right here, do not continue looping through callback
-			}
-			char *style = (char *)lpelf->elfStyle;
-			if (strequal(style, "Regular"))
-				/* UNCHECKED */ MCListAppend(s_style_list, MCN_plain);
-			else if (strequal(style, "Bold Italic"))
-				/* UNCHECKED */ MCListAppend(s_style_list, MCN_bold_italic)
-			else
-				/* UNCHECKED */ MCListAppendCString(s_style_list, (char*)lpelf->elfStyle);
-			break;
-		}
-	default:
-		break;
-	}
-	return True;
+	return MCListCopy(*t_list, r_sizes);
 }
-#endif
 
 bool MCFontlist::getfontstyles(MCStringRef p_fname, uint2 fsize, MCListRef& r_styles)
 {
@@ -583,20 +440,10 @@ bool MCFontlist::getfontstyles(MCStringRef p_fname, uint2 fsize, MCListRef& r_st
 		return false;
 
 	bool t_success = true;
-#ifdef FOR_TRUE_TYPE_ONLY
-	s_style_list = *t_list;
-	nfonts = 0;
-	char mappedName[LF_FACESIZE];
-	mapfacename(mappedName, fname);
-	MCScreenDC *pms = (MCScreenDC *)MCscreen;
-	HDC hdc = pms->getmemsrchdc();
-	EnumFontFamiliesA(hdc, mappedName, (FONTENUMPROC)MyFontFamProc, FQ_STYLES);
-#else
 	t_success = MCListAppend(*t_list, MCN_plain) &&
 		MCListAppend(*t_list, MCN_bold) &&
 		MCListAppend(*t_list, MCN_italic) &&
 		MCListAppend(*t_list, MCN_bold_italic);
-#endif
 
 	return t_success && MCListCopy(*t_list, r_styles);
 }
diff --git a/libfoundation/include/foundation.h b/libfoundation/include/foundation.h
@@ -3362,7 +3362,7 @@ typedef bool (*MCProperListMapCallback)(void *context, MCValueRef element, MCVal
 MC_DLLEXPORT bool MCProperListMap(MCProperListRef list, MCProperListMapCallback p_callback, MCProperListRef& r_new_list, void *context);
 
 // Sort list by comparing elements using the provided callback.
-typedef compare_t (*MCProperListQuickSortCallback)(const MCValueRef left, const MCValueRef right);
+typedef compare_t (*MCProperListQuickSortCallback)(const MCValueRef *left, const MCValueRef *right);
 MC_DLLEXPORT bool MCProperListSort(MCProperListRef list, bool p_reverse, MCProperListQuickSortCallback p_callback);
 
 typedef compare_t (*MCProperListCompareElementCallback)(void *context, const MCValueRef left, const MCValueRef right);
diff --git a/libgraphics/include/graphics.h b/libgraphics/include/graphics.h
@@ -564,6 +564,9 @@ inline MCGFont MCGFontMake(void *fid, uint16_t size, uint16_t fixed_advance, MCG
 bool MCGFontAddPlatformFileResource(MCStringRef p_file_resource_path);
 bool MCGFontRemovePlatformFileResource(MCStringRef p_file_resource_path);
 
+// Get list of available font families
+bool MCGFontGetPlatformFontList(MCProperListRef &r_fonts);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 inline bool MCGPointIsEqual(const MCGPoint &p_a, const MCGPoint &p_b)
diff --git a/libgraphics/src/directwrite-skia.cpp b/libgraphics/src/directwrite-skia.cpp
@@ -480,6 +480,87 @@ bool MCGFontRemovePlatformFileResource(MCStringRef p_file)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+static bool MCGDWGetDefaultLocalizedString(IDWriteLocalizedStrings *p_strings, MCStringRef &r_string)
+{
+	UINT32 t_index = 0;
+	BOOL t_found = FALSE;
+	if (!SUCCEEDED(p_strings->FindLocaleName(L"en-us", &t_index, &t_found)))
+		return false;
+
+	// Fallback to first name in list
+	if (!t_found)
+		t_index = 0;
+
+	UINT32 t_name_length;
+	if (!SUCCEEDED(p_strings->GetStringLength(t_index, &t_name_length)))
+		return false;
+
+	MCAutoArray<WCHAR> t_buffer;
+	if (!t_buffer.New(t_name_length + 1))
+		return false;
+	if (!SUCCEEDED(p_strings->GetString(t_index, t_buffer.Ptr(), t_name_length + 1)))
+		return false;
+
+	return MCStringCreateWithWString(t_buffer.Ptr(), r_string);
+}
+
+static bool MCGDWAddCollectionFontsToList(IDWriteFontCollection *p_collection, MCProperListRef p_list)
+{
+	if (p_collection == nil)
+		return true;
+
+	bool t_success = true;
+
+	UINT32 t_count;
+	t_count = p_collection->GetFontFamilyCount();
+
+	for (uint32_t i = 0; t_success && i < t_count; i++)
+	{
+		IDWriteFontFamily *t_family = nil;
+		t_success = SUCCEEDED(p_collection->GetFontFamily(i, &t_family));
+
+		IDWriteLocalizedStrings *t_names = nil;
+		if (t_success)
+			t_success = SUCCEEDED(t_family->GetFamilyNames(&t_names));
+
+		MCAutoStringRef t_name;
+		if (t_success)
+			t_success = MCGDWGetDefaultLocalizedString(t_names, &t_name);
+
+		if (t_success)
+			t_success = MCProperListPushElementOntoBack(p_list, *t_name);
+
+		if (t_names != nil)
+			t_names->Release();
+		if (t_family != nil)
+			t_family->Release();
+	}
+}
+
+bool MCGFontGetPlatformFontList(MCProperListRef &r_fonts)
+{
+	bool t_success = true;
+
+	MCAutoProperListRef t_fonts;
+	t_success = MCProperListCreateMutable(&t_fonts);
+
+	IDWriteFontCollection *t_system_collection = nil;
+	if (t_success)
+		t_success = SUCCEEDED(s_DWFactory->GetSystemFontCollection(&t_system_collection));
+	if (t_success)
+		t_success = MCGDWAddCollectionFontsToList(t_system_collection, *t_fonts);
+
+	if (t_success && s_DWFontCollection != nil)
+		t_success = MCGDWAddCollectionFontsToList(s_DWFontCollection, *t_fonts);
+
+	if (t_success)
+		r_fonts = t_fonts.Take();
+
+	return t_success;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 // Creates a DirectWrite text format object from an HFONT
 static IDWriteTextFormat* MCGDWTextFormatFromHFONT(HFONT p_hfont, MCGFloat p_size)
 {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix incorrect fontnames listed on Windows`