Wrote a fontmatch.cpp.

windows/OLD_drawtext.cpp

@@ -30,26 +30,6 @@ struct uiDrawTextLayout {
 // fortunately Microsoft does this too, in https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554%28v=vs.85%29.aspx
 #define pointSizeToDWriteSize(size) (size * (96.0 / 72.0))
 
-// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before)
-std::map<uiDrawTextItalic, DWRITE_FONT_STYLE> dwriteItalics = {
-	{ uiDrawTextItalicNormal, DWRITE_FONT_STYLE_NORMAL },
-	{ uiDrawTextItalicOblique, DWRITE_FONT_STYLE_OBLIQUE },
-	{ uiDrawTextItalicItalic, DWRITE_FONT_STYLE_ITALIC },
-};
-
-// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before)
-std::map<uiDrawTextStretch, DWRITE_FONT_STRETCH> dwriteStretches = {
-	{ uiDrawTextStretchUltraCondensed, DWRITE_FONT_STRETCH_ULTRA_CONDENSED },
-	{ uiDrawTextStretchExtraCondensed, DWRITE_FONT_STRETCH_EXTRA_CONDENSED },
-	{ uiDrawTextStretchCondensed, DWRITE_FONT_STRETCH_CONDENSED },
-	{ uiDrawTextStretchSemiCondensed, DWRITE_FONT_STRETCH_SEMI_CONDENSED },
-	{ uiDrawTextStretchNormal, DWRITE_FONT_STRETCH_NORMAL },
-	{ uiDrawTextStretchSemiExpanded, DWRITE_FONT_STRETCH_SEMI_EXPANDED },
-	{ uiDrawTextStretchExpanded, DWRITE_FONT_STRETCH_EXPANDED },
-	{ uiDrawTextStretchExtraExpanded, DWRITE_FONT_STRETCH_EXTRA_EXPANDED },
-	{ uiDrawTextStretchUltraExpanded, DWRITE_FONT_STRETCH_ULTRA_EXPANDED },
-};
-
 struct lineInfo {
 	size_t startPos;			// in UTF-16 points
 	size_t endPos;
@@ -154,14 +134,9 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
 	wDefaultFamily = toUTF16(p->DefaultFont->Family);
 	hr = dwfactory->CreateTextFormat(
 		wDefaultFamily, NULL,
-		// for the most part, DirectWrite weights correlate to ours
+		uiprivWeightToDWriteWeight(p->DefaultFont->Weight),
-		// the differences:
+		uiprivItalicToDWriteStyle(p->DefaultFont->Italic),
-		// - Minimum — libui: 0, DirectWrite: 1
+		uiprivStretchToDWriteStretch(p->DefaultFont->Stretch),
-		// - Maximum — libui: 1000, DirectWrite: 999
-		// TODO figure out what to do about this shorter range (the actual major values are the same (but with different names), so it's just a range issue)
-		(DWRITE_FONT_WEIGHT) (p->DefaultFont->Weight),
-		dwriteItalics[p->DefaultFont->Italic],
-		dwriteStretches[p->DefaultFont->Stretch],
 		pointSizeToDWriteSize(p->DefaultFont->Size),
 		// see http://stackoverflow.com/questions/28397971/idwritefactorycreatetextformat-failing and https://msdn.microsoft.com/en-us/library/windows/desktop/dd368203.aspx
 		// TODO use the current locale?

windows/attrstr.hpp

@@ -5,3 +5,8 @@ extern "C" {
 
 // opentype.cpp
 extern IDWriteTypography *uiprivOpenTypeFeaturesToIDWriteTypography(const uiOpenTypeFeatures *otf);
+
+// fontmatch.cpp
+extern DWRITE_FONT_WEIGHT uiprivWeightToDWriteWeight(uiTextWeight w);
+extern DWRITE_FONT_STYLE uiprivItalicToDWriteStyle(uiTextItalic i);
+extern DWRITE_FONT_STRETCH uiprivStretchToDWriteStretch(uiTextStretch s);

windows/fontmatch.cpp

@@ -0,0 +1,43 @@
+// 11 march 2018
+#include "uipriv_windows.hpp"
+#include "attrstr.hpp"
+
+// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before)
+static std::map<uiTextItalic, DWRITE_FONT_STYLE> dwriteItalics = {
+	{ uiTextItalicNormal, DWRITE_FONT_STYLE_NORMAL },
+	{ uiTextItalicOblique, DWRITE_FONT_STYLE_OBLIQUE },
+	{ uiTextItalicItalic, DWRITE_FONT_STYLE_ITALIC },
+};
+
+// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before)
+static std::map<uiTextStretch, DWRITE_FONT_STRETCH> dwriteStretches = {
+	{ uiTextStretchUltraCondensed, DWRITE_FONT_STRETCH_ULTRA_CONDENSED },
+	{ uiTextStretchExtraCondensed, DWRITE_FONT_STRETCH_EXTRA_CONDENSED },
+	{ uiTextStretchCondensed, DWRITE_FONT_STRETCH_CONDENSED },
+	{ uiTextStretchSemiCondensed, DWRITE_FONT_STRETCH_SEMI_CONDENSED },
+	{ uiTextStretchNormal, DWRITE_FONT_STRETCH_NORMAL },
+	{ uiTextStretchSemiExpanded, DWRITE_FONT_STRETCH_SEMI_EXPANDED },
+	{ uiTextStretchExpanded, DWRITE_FONT_STRETCH_EXPANDED },
+	{ uiTextStretchExtraExpanded, DWRITE_FONT_STRETCH_EXTRA_EXPANDED },
+	{ uiTextStretchUltraExpanded, DWRITE_FONT_STRETCH_ULTRA_EXPANDED },
+};
+
+// for the most part, DirectWrite weights correlate to ours
+// the differences:
+// - Minimum — libui: 0, DirectWrite: 1
+// - Maximum — libui: 1000, DirectWrite: 999
+// TODO figure out what to do about this shorter range (the actual major values are the same (but with different names), so it's just a range issue)
+DWRITE_FONT_WEIGHT uiprivWeightToDWriteWeight(uiTextWeight w)
+{
+	return (DWRITE_FONT_WEIGHT) w;
+}
+
+DWRITE_FONT_STYLE uiprivItalicToDWriteStyle(uiTextItalic i)
+{
+	return dwriteItalics[i];
+}
+
+DWRITE_FONT_STRETCH uiprivStretchToDWriteStretch(uiTextStretch s)
+{
+	return dwriteStretches[s];
+}