oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

GUIHyperText: Fix bug with UTF8 chars in action name + simplify UTF8 stringw conversion (#9437)

Browse source 
Co-authored-by: Pierre-Yves Rollo <dev@pyrollo.com>
This commit is contained in:
Jean-Patrick Guerrero 2020-03-07 14:01:11 +01:00 • committed by GitHub
parent ce8cdc0333
commit 0e88176db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/util/string.cpp
View file

@ -860,28 +860,3 @@ std::wstring translate_string(const std::wstring &s) {
translate_all(s, i, res);
return res;
}
/**
* Create a std::string from a irr::core:stringw.
*/
std::string strwtostr(const irr::core::stringw &str)
{
std::string text = core::stringc(str.c_str()).c_str();
return text;
}
/**
* Create a irr::core:stringw from a std::string.
*/
irr::core::stringw strtostrw(const std::string &str)
{
size_t size = str.size();
// s.size() doesn't include NULL terminator
wchar_t *text = new wchar_t[size + sizeof(wchar_t)];
const char *data = &str[0];
mbsrtowcs(text, &data, size, NULL);
text[size] = L'\0';
return text;
}

20
src/util/string.h
View file

@ -726,11 +726,19 @@ inline std::string str_join(const std::vector<std::string> &list,
}
/**
* Create a std::string from a irr::core::stringw.
* Create a UTF8 std::string from a irr::core::stringw.
*/
std::string strwtostr(const irr::core::stringw &str);
inline std::string stringw_to_utf8(const irr::core::stringw &input)
{
std::wstring str(input.c_str());
return wide_to_utf8(str);
}
/**
* Create a irr::core:stringw from a std::string.
*/
irr::core::stringw strtostrw(const std::string &str);
/**
* Create a irr::core:stringw from a UTF8 std::string.
*/
inline irr::core::stringw utf8_to_stringw(const std::string &input)
{
std::wstring str = utf8_to_wide(input);
return irr::core::stringw(str.c_str());
}