BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Android: fix handling non-latin characters on older Android devices (#9309)

Browse Source
This commit is contained in:
Maksim 2020-04-17 23:46:30 +02:00 committed by GitHub
parent 4e2473ec49
commit 23c6d0c31f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server.cpp
View File

@ -3031,8 +3031,16 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
line += L"-!- You don't have permission to shout."; line += L"-!- You don't have permission to shout.";
broadcast_line = false; broadcast_line = false;
} else { } else {
/*
Workaround for fixing chat on Android. Lua doesn't handle
the Cyrillic alphabet and some characters on older Android devices
*/
#ifdef __ANDROID__
line += L"<" + wname + L"> " + wmessage;
#else
line += narrow_to_wide(m_script->formatChatMessage(name, line += narrow_to_wide(m_script->formatChatMessage(name,
wide_to_narrow(wmessage))); wide_to_narrow(wmessage)));
#endif
} }
/* /*

8
src/util/string.cpp
View File

@ -209,6 +209,9 @@ wchar_t *narrow_to_wide_c(const char *str)
} }
std::wstring narrow_to_wide(const std::string &mbs) { std::wstring narrow_to_wide(const std::string &mbs) {
#ifdef __ANDROID__
return utf8_to_wide(mbs);
#else
size_t wcl = mbs.size(); size_t wcl = mbs.size();
Buffer<wchar_t> wcs(wcl + 1); Buffer<wchar_t> wcs(wcl + 1);
size_t len = mbstowcs(*wcs, mbs.c_str(), wcl); size_t len = mbstowcs(*wcs, mbs.c_str(), wcl);
@ -216,11 +219,15 @@ std::wstring narrow_to_wide(const std::string &mbs) {
return L"<invalid multibyte string>"; return L"<invalid multibyte string>";
wcs[len] = 0; wcs[len] = 0;
return *wcs; return *wcs;
#endif
} }
std::string wide_to_narrow(const std::wstring &wcs) std::string wide_to_narrow(const std::wstring &wcs)
{ {
#ifdef __ANDROID__
return wide_to_utf8(wcs);
#else
size_t mbl = wcs.size() * 4; size_t mbl = wcs.size() * 4;
SharedBuffer<char> mbs(mbl+1); SharedBuffer<char> mbs(mbl+1);
size_t len = wcstombs(*mbs, wcs.c_str(), mbl); size_t len = wcstombs(*mbs, wcs.c_str(), mbl);
@ -229,6 +236,7 @@ std::string wide_to_narrow(const std::wstring &wcs)
mbs[len] = 0; mbs[len] = 0;
return *mbs; return *mbs;
#endif
} }