From 2f73df09e3b851c4392f11c72c86b3f8ec172730 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 17 May 2017 16:15:54 -0400
Subject: [PATCH] And adjusted the Windows attrstr.cpp to boot. Now to rewrite
 the example and test.

---
 ui_attrstr.h         |  1 +
 windows/attrstr.cpp  | 68 +++++++++++---------------------------------
 windows/opentype.cpp |  1 -
 3 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/ui_attrstr.h b/ui_attrstr.h
index f7c03b03..d66f2e9a 100644
--- a/ui_attrstr.h
+++ b/ui_attrstr.h
@@ -32,6 +32,7 @@ _UI_ENUM(uiAttribute) {
 	// TODO document that the color in the case we don't specify it is the text color
 	uiAttributeUnderlineColor,	// enum uiDrawUnderlineColor
 
+	// TODO note that for the purpose of uiAttributedString two sets of features are only the same (and thus their attributes are merged) only if the pointers are the same; whether the tag sets are the same only become relevant to uiDrawTextLayout
 	uiAttributeFeatures,			// object of type uiOpenTypeFeatures
 
 #if 0
diff --git a/windows/attrstr.cpp b/windows/attrstr.cpp
index ad2fad0e..3b652979 100644
--- a/windows/attrstr.cpp
+++ b/windows/attrstr.cpp
@@ -2,9 +2,11 @@
 #include "uipriv_windows.hpp"
 #include "draw.hpp"
 
+// TODO this whole file needs cleanup
+
 // we need to combine color and underline style into one unit for IDWriteLayout::SetDrawingEffect()
 // we also need to collect all the OpenType features and background blocks and add them all at once
-// TODO(TODO does not seem to apply here) this is the wrong approach; it causes Pango to end runs early, meaning attributes like the ligature attributes never get applied properly
+// TODO(TODO does not seem to apply here?) this is the wrong approach; it causes Pango to end runs early, meaning attributes like the ligature attributes never get applied properly
 // TODO contextual alternates override ligatures?
 // TODO rename this struct to something that isn't exclusively foreach-ing?
 struct foreachParams {
@@ -38,25 +40,22 @@ static void ensureEffectsInRange(struct foreachParams *p, size_t start, size_t e
 	}
 }
 
-static void ensureFeaturesInRange(struct foreachParams *p, size_t start, size_t end)
+static void setFeaturesInRange(struct foreachParams *p, size_t start, size_t end, uiOpenTypeFeatures *otf)
 {
+	IDWriteTypography *dt;
 	size_t i;
-	size_t *key;
-	IDWriteTypography *t;
-	HRESULT hr;
 
+	dt = otfToDirectWrite(otf);
 	for (i = start; i < end; i++) {
 		// don't create redundant entries; see below
+		// TODO explain this more clearly (surrogate pairs)
 		if (!isCodepointStart(p->s[i]))
 			continue;
-		t = (*(p->features))[i];
-		if (t != NULL)
-			continue;
-		hr = dwfactory->CreateTypography(&t);
-		if (hr != S_OK)
-			logHRESULT(L"error creating IDWriteTypography", hr);
-		(*(p->features))[i] = t;
+		dt->AddRef();
+		(*(p->features))[i] = dt;
 	}
+	// and release the initial reference
+	dt->Release();
 }
 
 static backgroundFunc mkBackgroundFunc(size_t start, size_t end, double r, double g, double b, double a)
@@ -73,38 +72,6 @@ static backgroundFunc mkBackgroundFunc(size_t start, size_t end, double r, doubl
 	};
 }
 
-struct otParam {
-	struct foreachParams *p;
-	size_t start;
-	size_t end;
-};
-
-static void doOpenType(const char *featureTag, uint32_t param, void *data)
-{
-	struct otParam *p = (struct otParam *) data;
-	size_t i;
-	IDWriteTypography *t;
-	DWRITE_FONT_FEATURE feature;
-	HRESULT hr;
-
-	feature.nameTag = (DWRITE_FONT_FEATURE_TAG) DWRITE_MAKE_OPENTYPE_TAG(
-		featureTag[0],
-		featureTag[1],
-		featureTag[2],
-		featureTag[3]);
-	feature.parameter = param;
-	ensureFeaturesInRange(p->p, p->start, p->end);
-	for (i = p->start; i < p->end; i++) {
-		// don't use redundant entries; see below
-		if (!isCodepointStart(p->p->s[i]))
-			continue;
-		t = (*(p->p->features))[i];
-		hr = t->AddFontFeature(feature);
-		if (hr != S_OK)
-			logHRESULT(L"error adding feature to IDWriteTypography", hr);
-	}
-}
-
 static int processAttribute(uiAttributedString *s, uiAttributeSpec *spec, size_t start, size_t end, void *data)
 {
 	struct foreachParams *p = (struct foreachParams *) data;
@@ -112,7 +79,6 @@ static int processAttribute(uiAttributedString *s, uiAttributeSpec *spec, size_t
 	WCHAR *wfamily;
 	size_t ostart, oend;
 	BOOL hasUnderline;
-	struct otParam op;
 	HRESULT hr;
 
 	ostart = start;
@@ -229,14 +195,12 @@ static int processAttribute(uiAttributedString *s, uiAttributeSpec *spec, size_t
 			break;
 		}
 		break;
-	default:
-		// handle typographic features
-		op.p = p;
-		op.start = start;
-		op.end = end;
-		// TODO check if unhandled and complain
-		specToOpenType(spec, doOpenType, &op);
+	cae uiAttributeOpenTypeFeatures:
+		setFeaturesInRange(p, start, end, (uiOpenTypeFeatures *) (spec->Value));
 		break;
+	default:
+		// TODO complain
+		;
 	}
 	return 0;
 }
diff --git a/windows/opentype.cpp b/windows/opentype.cpp
index 21e681b7..f3ca36c3 100644
--- a/windows/opentype.cpp
+++ b/windows/opentype.cpp
@@ -75,7 +75,6 @@ void uiOpenTypeFeaturesForEach(uiOpenTypeFeatures *otf, uiOpenTypeFeaturesForEac
 	}
 }
 
-// TODO wait, is this function even necessary? how do we unify attributes??
 int uiOpenTypeFeaturesEqual(uiOpenTypeFeatures *a, uiOpenTypeFeatures *b)
 {
 	// TODO make sure this is correct