EGE/src/ege/gapi.cpp: 修复函数 setcolor 、setlinestyle 和 setlinewidth 并简化实现。

参见 wysaid/xege#13 。 Signed-off-by: FrankHB <frankhb1989@gmail.com>
FrankHB · Apr 15, 2020 · 8760d71 · 8760d71
1 parent 383917f
commit 8760d71
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 92 deletions.
diff --git a/Compatibility.md b/Compatibility.md
@@ -22,11 +22,19 @@ YEGE 以 [misakamm 的 xege](http://github.com/misakamm/xege) 为基础修改，
 * 函数 `clearviewport` 使用背景颜色填充。
 	* 参见 [wysaid/xege pull request 12](https://github.com/wysaid/xege/pull/12) 。
 * 修复函数 `getch` 阻塞不返回（自从 19.01 ）。
+* 修复函数 `setcolor` 、`setlinestyle` 和 `setlinewidth` 并简化实现。
+	* 参见 [wysaid/xege pull request 13](https://github.com/wysaid/xege/pull/13) 。
 
 ### 非外部依赖项代码风格和格式
 
 * 函数参数列表 `(void)` 修改为 `()` 。
 
+### 外部依赖项全局名称
+
+具有以下所列前缀的外部依赖项全局名称在使用时附加前缀 `::` ：
+
+* `ExtC`
+
 ## 19.01
 
 YEGE 19.01 以 YEGE 14.01 为基础修改。

diff --git a/EGE/src/ege/gapi.cpp b/EGE/src/ege/gapi.cpp
@@ -42,6 +42,59 @@ _save_brush(IMAGE* img, int save)
 	return 0;
 }
 
+::DWORD
+upattern2array(unsigned short upattern, ::DWORD style[]) ynothrow
+{
+	::DWORD bn(0), len(1);
+	bool st((upattern & 1) != 0);
+
+	for(size_t n(1); n < 16; ++n)
+	{
+		const bool cbit((upattern & (1 << n)) != 0);
+
+		if(st == cbit)
+			++len;
+		else
+		{
+			st = cbit;
+			style[bn++] = len;
+			len = 1;
+		}
+	}
+	style[bn] = len;
+	++bn;
+	if((upattern & 1) == 0 && bn % 2 == 0)
+	{
+		const auto p0(style[0]);
+
+		for(size_t i(0); i < bn - 1; ++i)
+			style[i] = style[i + 1];
+		style[bn - 1] = p0;
+	}
+	return bn;
+}
+
+void
+update_ls_pen(::HDC h_dc, ::COLORREF bgrcolor, int linestyle, int thickness,
+	int upattern) ynothrow
+{
+	if(const auto hpen = [&]() ynothrow -> ::HPEN{
+		const ::LOGBRUSH lbr{BS_SOLID, bgrcolor, 0};
+		const int
+			ls(linestyle | PS_GEOMETRIC | PS_ENDCAP_ROUND | PS_JOIN_ROUND);
+
+		if(linestyle == USERBIT_LINE)
+		{
+			::DWORD style[20]{0};
+
+			return ::ExtCreatePen(ls, thickness, &lbr,
+				upattern2array(upattern, style), style);
+		}
+		return ::ExtCreatePen(ls, thickness, &lbr, 0, {});
+	}())
+		::DeleteObject(::SelectObject(h_dc, hpen));
+}
+
 } // unnamed namespace;
 
 
@@ -116,63 +169,31 @@ setlinestyle(int linestyle, unsigned short upattern, int thickness, IMAGE* pimg)
 {
 	auto& img(cimg_ref_c(pimg));
 
-	::LOGPEN lpen{0, ::POINT(), RGBTOBGR(getcolor(pimg))};
-
-	img.m_linestyle.thickness = thickness;
-	img.m_linewidth = float(thickness);
-	img.m_linestyle.linestyle = linestyle;
-	img.m_linestyle.upattern = upattern;
-	lpen.lopnWidth.x = thickness;
-	lpen.lopnStyle   = linestyle;
-
-	::HPEN hpen;
-
-	if(linestyle == PS_USERSTYLE)
+	if(const auto h_dc = img.getdc())
 	{
-		unsigned long style[20]{0};
-		::LOGBRUSH lbr{BS_SOLID, lpen.lopnColor, 0};
-		int n, bn = 0, len = 1, st(upattern & 1);
-
-		for(n = 1; n < 16; n++)
-		{
-			if(upattern & (1 << n))
-			{
-				if(st == 0)
-				{
-					st = 1;
-					style[bn++] = len;
-					len = 1;
-				}
-				else
-					++len;
-			}
-			else
-			{
-				if(st == 0)
-					++len;
-				else
-				{
-					st = 0;
-					style[bn++] = len;
-					len = 1;
-				}
-			}
-		}
-		hpen = ExtCreatePen(PS_GEOMETRIC, thickness, &lbr, bn, style);
+		img.m_linestyle.thickness = thickness;
+		img.m_linewidth = float(thickness);
+		img.m_linestyle.linestyle = linestyle;
+		img.m_linestyle.upattern = upattern;
+		update_ls_pen(h_dc, RGBTOBGR(img.m_color), linestyle, thickness,
+			upattern);
 	}
-	else
-		hpen = ::CreatePenIndirect(&lpen);
-	if(hpen)
-		::DeleteObject(::SelectObject(img.getdc(), hpen));
 }
 
 void
 setlinewidth(float width, IMAGE* pimg)
 {
 	auto& img(cimg_ref_c(pimg));
 
-	img.m_linestyle.thickness = int(width);
-	img.m_linewidth = width;
+	if(const auto h_dc = img.getdc())
+	{
+		const int thickness = int(width);
+
+		img.m_linestyle.thickness = thickness;
+		img.m_linewidth = width;
+		update_ls_pen(h_dc, RGBTOBGR(img.m_color), img.m_linestyle.linestyle,
+			thickness, img.m_linestyle.upattern);
+	}
 }
 
 void
@@ -257,53 +278,14 @@ setcolor(color_t color, IMAGE* pimg)
 {
 	auto& img(cimg_ref(pimg));
 
-	if(img.getdc())
+	if(const auto h_dc = img.getdc())
 	{
-		::LOGPEN lPen;
-		::HPEN hpen;
+		const auto bgrcolor(RGBTOBGR(color));
 
 		img.m_color = color;
-		lPen.lopnColor = RGBTOBGR(color);
-		lPen.lopnStyle = img.m_linestyle.linestyle;
-		lPen.lopnWidth.x = img.m_linestyle.thickness;
-		::SetTextColor(img.getdc(), color);
-		if(lPen.lopnStyle == PS_USERSTYLE)
-		{
-			unsigned long style[20]{};
-			::LOGBRUSH lbr{BS_SOLID, lPen.lopnColor, 0};
-			unsigned short upattern = img.m_linestyle.upattern;
-			int n, bn = 0, len = 1, st(upattern & 1);
-
-			for(n = 1; n < 16; n++)
-				if(upattern & (1 << n))
-				{
-					if(st == 0)
-					{
-						st = 1;
-						style[bn++] = len;
-						len = 1;
-					}
-					else
-						++len;
-				}
-				else
-				{
-					if(st == 0)
-						++len;
-					else
-					{
-						st = 0;
-						style[bn++] = len;
-						len = 1;
-					}
-				}
-			hpen = ::ExtCreatePen(PS_GEOMETRIC, img.m_linestyle.thickness,
-				&lbr, bn, style);
-		}
-		else
-			hpen = ::CreatePenIndirect(&lPen);
-		if(hpen)
-			::DeleteObject(::SelectObject(img.getdc(), hpen));
+		update_ls_pen(h_dc, bgrcolor, img.m_linestyle.linestyle,
+			img.m_linestyle.thickness, img.m_linestyle.upattern);
+		::SetTextColor(h_dc, bgrcolor);
 	}
 }