From 0e88176db8ce9f3fb631feb56bdd29d4ada054f5 Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <kilbith@users.noreply.github.com>
Date: Sat, 7 Mar 2020 14:01:11 +0100
Subject: GUIHyperText: Fix bug with UTF8 chars in action name + simplify UTF8
 stringw conversion (#9437)

Co-authored-by: Pierre-Yves Rollo <dev@pyrollo.com>
---
 src/gui/guiHyperText.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui/guiHyperText.cpp')

diff --git a/src/gui/guiHyperText.cpp b/src/gui/guiHyperText.cpp
index e5f945789..7b7d3a1b2 100644
--- a/src/gui/guiHyperText.cpp
+++ b/src/gui/guiHyperText.cpp
@@ -405,7 +405,7 @@ u32 ParsedText::parseTag(const wchar_t *text, u32 cursor)
 	AttrsList attrs;
 	while (c != L'>') {
 		std::string attr_name = "";
-		std::string attr_val = "";
+		core::stringw attr_val = L"";
 
 		while (c == ' ') {
 			c = text[++cursor];
@@ -435,13 +435,13 @@ u32 ParsedText::parseTag(const wchar_t *text, u32 cursor)
 			return 0;
 
 		while (c != L'>' && c != L' ') {
-			attr_val += (char)c;
+			attr_val += c;
 			c = text[++cursor];
 			if (c == L'\0')
 				return 0;
 		}
 
-		attrs[attr_name] = attr_val;
+		attrs[attr_name] = stringw_to_utf8(attr_val);
 	}
 
 	++cursor; // Last ">"
@@ -486,7 +486,7 @@ u32 ParsedText::parseTag(const wchar_t *text, u32 cursor)
 		else
 			enterElement(ELEMENT_ITEM);
 
-		m_element->text = strtostrw(attrs["name"]);
+		m_element->text = utf8_to_stringw(attrs["name"]);
 
 		if (attrs.count("float")) {
 			if (attrs["float"] == "left")
@@ -626,7 +626,7 @@ TextDrawer::TextDrawer(const wchar_t *text, Client *client,
 				if (e.type == ParsedText::ELEMENT_IMAGE) {
 					video::ITexture *texture =
 						m_client->getTextureSource()->
-							getTexture(strwtostr(e.text));
+							getTexture(stringw_to_utf8(e.text));
 					if (texture)
 						dim = texture->getOriginalSize();
 				}
@@ -952,7 +952,7 @@ void TextDrawer::draw(const core::rect<s32> &dest_rect,
 			case ParsedText::ELEMENT_IMAGE: {
 				video::ITexture *texture =
 						m_client->getTextureSource()->getTexture(
-								strwtostr(el.text));
+								stringw_to_utf8(el.text));
 				if (texture != 0)
 					m_environment->getVideoDriver()->draw2DImage(
 							texture, rect,
@@ -965,7 +965,7 @@ void TextDrawer::draw(const core::rect<s32> &dest_rect,
 			case ParsedText::ELEMENT_ITEM: {
 				IItemDefManager *idef = m_client->idef();
 				ItemStack item;
-				item.deSerialize(strwtostr(el.text), idef);
+				item.deSerialize(stringw_to_utf8(el.text), idef);
 
 				drawItemStack(
 						m_environment->getVideoDriver(),
@@ -1083,7 +1083,7 @@ bool GUIHyperText::OnEvent(const SEvent &event)
 				for (auto &tag : element->tags) {
 					if (tag->name == "action") {
 						Text = core::stringw(L"action:") +
-						       strtostrw(tag->attrs["name"]);
+						       utf8_to_stringw(tag->attrs["name"]);
 						if (Parent) {
 							SEvent newEvent;
 							newEvent.EventType = EET_GUI_EVENT;
-- 
cgit v1.2.3