mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Use UTF-8 instead of narrow
Use wide_to_utf8 and utf8_to_wide instead of wide_to_narrow and narrow_to_wide at almost all places. Only exceptions: test functions for narrow conversion, and chat, which is done in a separate commit.
This commit is contained in:
parent
e234d8b378
commit
b0784ba871
@ -183,7 +183,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
|
||||
{
|
||||
// Set the window caption
|
||||
const wchar_t *text = wgettext("Main Menu");
|
||||
device->setWindowCaption((narrow_to_wide(PROJECT_NAME_C) + L" [" + text + L"]").c_str());
|
||||
device->setWindowCaption((utf8_to_wide(PROJECT_NAME_C) + L" [" + text + L"]").c_str());
|
||||
delete[] text;
|
||||
|
||||
try { // This is used for catching disconnects
|
||||
|
@ -970,7 +970,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
|
||||
if (node && m_is_player && !m_is_local_player) {
|
||||
// Add a text node for showing the name
|
||||
gui::IGUIEnvironment* gui = irr->getGUIEnvironment();
|
||||
std::wstring wname = narrow_to_wide(m_name);
|
||||
std::wstring wname = utf8_to_wide(m_name);
|
||||
m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(),
|
||||
wname.c_str(), m_nametag_color, node);
|
||||
m_textnode->grab();
|
||||
|
@ -59,7 +59,7 @@ public:
|
||||
unsigned int font_size=FONT_SIZE_UNSPECIFIED,
|
||||
FontMode mode=FM_Unspecified)
|
||||
{
|
||||
return getTextWidth(narrow_to_wide(text));
|
||||
return getTextWidth(utf8_to_wide(text));
|
||||
}
|
||||
|
||||
/** get text width if a text for a specific font */
|
||||
|
58
src/game.cpp
58
src/game.cpp
@ -85,7 +85,7 @@ struct TextDestNodeMetadata : public TextDest {
|
||||
// This is deprecated I guess? -celeron55
|
||||
void gotText(std::wstring text)
|
||||
{
|
||||
std::string ntext = wide_to_narrow(text);
|
||||
std::string ntext = wide_to_utf8(text);
|
||||
infostream << "Submitting 'text' field of node at (" << m_p.X << ","
|
||||
<< m_p.Y << "," << m_p.Z << "): " << ntext << std::endl;
|
||||
StringMap fields;
|
||||
@ -183,7 +183,7 @@ struct LocalFormspecHandler : public TextDest {
|
||||
(fields.find("quit") != fields.end())) {
|
||||
StringMap::const_iterator it = fields.find("f_text");
|
||||
if (it != fields.end())
|
||||
m_client->typeChatMessage(narrow_to_wide(it->second));
|
||||
m_client->typeChatMessage(utf8_to_wide(it->second));
|
||||
|
||||
return;
|
||||
}
|
||||
@ -445,7 +445,7 @@ void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
|
||||
|
||||
std::ostringstream os(std::ios_base::binary);
|
||||
g_profiler->printPage(os, show_profiler, show_profiler_max);
|
||||
std::wstring text = narrow_to_wide(os.str());
|
||||
std::wstring text = utf8_to_wide(os.str());
|
||||
guitext_profiler->setText(text.c_str());
|
||||
guitext_profiler->setVisible(true);
|
||||
|
||||
@ -582,16 +582,16 @@ public:
|
||||
s32 texth = 15;
|
||||
char buf[10];
|
||||
snprintf(buf, 10, "%.3g", show_max);
|
||||
font->draw(narrow_to_wide(buf).c_str(),
|
||||
font->draw(utf8_to_wide(buf).c_str(),
|
||||
core::rect<s32>(textx, y - graphh,
|
||||
textx2, y - graphh + texth),
|
||||
meta.color);
|
||||
snprintf(buf, 10, "%.3g", show_min);
|
||||
font->draw(narrow_to_wide(buf).c_str(),
|
||||
font->draw(utf8_to_wide(buf).c_str(),
|
||||
core::rect<s32>(textx, y - texth,
|
||||
textx2, y),
|
||||
meta.color);
|
||||
font->draw(narrow_to_wide(id).c_str(),
|
||||
font->draw(utf8_to_wide(id).c_str(),
|
||||
core::rect<s32>(textx, y - graphh / 2 - texth / 2,
|
||||
textx2, y - graphh / 2 + texth / 2),
|
||||
meta.color);
|
||||
@ -1049,7 +1049,7 @@ static void show_chat_menu(GUIFormSpecMenu **cur_formspec,
|
||||
FORMSPEC_VERSION_STRING
|
||||
SIZE_TAG
|
||||
"field[3,2.35;6,0.5;f_text;;" + text + "]"
|
||||
"button_exit[4,3;3,0.5;btn_send;" + wide_to_narrow(wstrgettext("Proceed")) + "]"
|
||||
"button_exit[4,3;3,0.5;btn_send;" + wide_to_utf8(wstrgettext("Proceed")) + "]"
|
||||
;
|
||||
|
||||
/* Create menu */
|
||||
@ -1089,7 +1089,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
|
||||
bool singleplayermode)
|
||||
{
|
||||
#ifdef __ANDROID__
|
||||
std::string control_text = wide_to_narrow(wstrgettext("Default Controls:\n"
|
||||
std::string control_text = wide_to_utf8(wstrgettext("Default Controls:\n"
|
||||
"No menu visible:\n"
|
||||
"- single tap: button activate\n"
|
||||
"- double tap: place/use\n"
|
||||
@ -1103,7 +1103,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
|
||||
" --> place single item to slot\n"
|
||||
));
|
||||
#else
|
||||
std::string control_text = wide_to_narrow(wstrgettext("Default Controls:\n"
|
||||
std::string control_text = wide_to_utf8(wstrgettext("Default Controls:\n"
|
||||
"- WASD: move\n"
|
||||
"- Space: jump/climb\n"
|
||||
"- Shift: sneak/go down\n"
|
||||
@ -1122,23 +1122,23 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
|
||||
|
||||
os << FORMSPEC_VERSION_STRING << SIZE_TAG
|
||||
<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
|
||||
<< wide_to_narrow(wstrgettext("Continue")) << "]";
|
||||
<< wide_to_utf8(wstrgettext("Continue")) << "]";
|
||||
|
||||
if (!singleplayermode) {
|
||||
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;"
|
||||
<< wide_to_narrow(wstrgettext("Change Password")) << "]";
|
||||
<< wide_to_utf8(wstrgettext("Change Password")) << "]";
|
||||
}
|
||||
|
||||
#ifndef __ANDROID__
|
||||
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;"
|
||||
<< wide_to_narrow(wstrgettext("Sound Volume")) << "]";
|
||||
<< wide_to_utf8(wstrgettext("Sound Volume")) << "]";
|
||||
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
|
||||
<< wide_to_narrow(wstrgettext("Change Keys")) << "]";
|
||||
<< wide_to_utf8(wstrgettext("Change Keys")) << "]";
|
||||
#endif
|
||||
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
|
||||
<< wide_to_narrow(wstrgettext("Exit to Menu")) << "]";
|
||||
<< wide_to_utf8(wstrgettext("Exit to Menu")) << "]";
|
||||
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
|
||||
<< wide_to_narrow(wstrgettext("Exit to OS")) << "]"
|
||||
<< wide_to_utf8(wstrgettext("Exit to OS")) << "]"
|
||||
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
|
||||
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
|
||||
<< g_build_info << "\n"
|
||||
@ -1167,7 +1167,7 @@ static void updateChat(Client &client, f32 dtime, bool show_debug,
|
||||
|
||||
// Get new messages from error log buffer
|
||||
while (!chat_log_error_buf.empty()) {
|
||||
chat_backend.addMessage(L"", narrow_to_wide(chat_log_error_buf.get()));
|
||||
chat_backend.addMessage(L"", utf8_to_wide(chat_log_error_buf.get()));
|
||||
}
|
||||
|
||||
// Get new messages from client
|
||||
@ -2059,7 +2059,7 @@ bool Game::createClient(const std::string &playername,
|
||||
|
||||
/* Set window caption
|
||||
*/
|
||||
std::wstring str = narrow_to_wide(PROJECT_NAME_C);
|
||||
std::wstring str = utf8_to_wide(PROJECT_NAME_C);
|
||||
str += L" [";
|
||||
str += driver->getName();
|
||||
str += L"]";
|
||||
@ -2087,7 +2087,7 @@ bool Game::initGui()
|
||||
{
|
||||
// First line of debug text
|
||||
guitext = guienv->addStaticText(
|
||||
narrow_to_wide(PROJECT_NAME_C).c_str(),
|
||||
utf8_to_wide(PROJECT_NAME_C).c_str(),
|
||||
core::rect<s32>(0, 0, 0, 0),
|
||||
false, false, guiroot);
|
||||
|
||||
@ -2342,7 +2342,7 @@ bool Game::getServerContent(bool *aborted)
|
||||
}
|
||||
|
||||
progress = 30 + client->mediaReceiveProgress() * 35 + 0.5;
|
||||
draw_load_screen(narrow_to_wide(message.str()), device,
|
||||
draw_load_screen(utf8_to_wide(message.str()), device,
|
||||
guienv, dtime, progress);
|
||||
}
|
||||
}
|
||||
@ -2660,7 +2660,7 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
|
||||
|
||||
if (quicktune->hasMessage()) {
|
||||
std::string msg = quicktune->getMessage();
|
||||
statustext = narrow_to_wide(msg);
|
||||
statustext = utf8_to_wide(msg);
|
||||
*statustext_time = 0;
|
||||
}
|
||||
}
|
||||
@ -2947,7 +2947,7 @@ void Game::increaseViewRange(float *statustext_time)
|
||||
s16 range = g_settings->getS16("viewing_range_nodes_min");
|
||||
s16 range_new = range + 10;
|
||||
g_settings->set("viewing_range_nodes_min", itos(range_new));
|
||||
statustext = narrow_to_wide("Minimum viewing range changed to "
|
||||
statustext = utf8_to_wide("Minimum viewing range changed to "
|
||||
+ itos(range_new));
|
||||
*statustext_time = 0;
|
||||
}
|
||||
@ -2962,7 +2962,7 @@ void Game::decreaseViewRange(float *statustext_time)
|
||||
range_new = range;
|
||||
|
||||
g_settings->set("viewing_range_nodes_min", itos(range_new));
|
||||
statustext = narrow_to_wide("Minimum viewing range changed to "
|
||||
statustext = utf8_to_wide("Minimum viewing range changed to "
|
||||
+ itos(range_new));
|
||||
*statustext_time = 0;
|
||||
}
|
||||
@ -3577,13 +3577,13 @@ void Game::handlePointingAtNode(GameRunData *runData,
|
||||
NodeMetadata *meta = map.getNodeMetadata(nodepos);
|
||||
|
||||
if (meta) {
|
||||
infotext = narrow_to_wide(meta->getString("infotext"));
|
||||
infotext = utf8_to_wide(meta->getString("infotext"));
|
||||
} else {
|
||||
MapNode n = map.getNodeNoEx(nodepos);
|
||||
|
||||
if (nodedef_manager->get(n).tiledef[0].name == "unknown_node.png") {
|
||||
infotext = L"Unknown node: ";
|
||||
infotext += narrow_to_wide(nodedef_manager->get(n).name);
|
||||
infotext += utf8_to_wide(nodedef_manager->get(n).name);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3649,10 +3649,10 @@ void Game::handlePointingAtObject(GameRunData *runData,
|
||||
const v3f &player_position,
|
||||
bool show_debug)
|
||||
{
|
||||
infotext = narrow_to_wide(runData->selected_object->infoText());
|
||||
infotext = utf8_to_wide(runData->selected_object->infoText());
|
||||
|
||||
if (infotext == L"" && show_debug) {
|
||||
infotext = narrow_to_wide(runData->selected_object->debugInfoText());
|
||||
infotext = utf8_to_wide(runData->selected_object->debugInfoText());
|
||||
}
|
||||
|
||||
if (input->getLeftState()) {
|
||||
@ -4117,12 +4117,12 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
|
||||
<< ", v_range = " << draw_control->wanted_range
|
||||
<< std::setprecision(3)
|
||||
<< ", RTT = " << client->getRTT();
|
||||
guitext->setText(narrow_to_wide(os.str()).c_str());
|
||||
guitext->setText(utf8_to_wide(os.str()).c_str());
|
||||
guitext->setVisible(true);
|
||||
} else if (flags.show_hud || flags.show_chat) {
|
||||
std::ostringstream os(std::ios_base::binary);
|
||||
os << PROJECT_NAME_C " " << g_version_hash;
|
||||
guitext->setText(narrow_to_wide(os.str()).c_str());
|
||||
guitext->setText(utf8_to_wide(os.str()).c_str());
|
||||
guitext->setVisible(true);
|
||||
} else {
|
||||
guitext->setVisible(false);
|
||||
@ -4159,7 +4159,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats,
|
||||
}
|
||||
}
|
||||
|
||||
guitext2->setText(narrow_to_wide(os.str()).c_str());
|
||||
guitext2->setText(utf8_to_wide(os.str()).c_str());
|
||||
guitext2->setVisible(true);
|
||||
|
||||
core::rect<s32> rect(
|
||||
|
@ -102,8 +102,9 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
|
||||
|
||||
last_raw_value = shortname;
|
||||
|
||||
if (glb_supported_locales.find(narrow_to_wide(shortname)) != glb_supported_locales.end()) {
|
||||
last_full_name = wide_to_narrow(glb_supported_locales[narrow_to_wide(shortname)]);
|
||||
if (glb_supported_locales.find(utf8_to_wide(shortname)) != glb_supported_locales.end()) {
|
||||
last_full_name = wide_to_utf8(
|
||||
glb_supported_locales[utf8_to_wide(shortname)]);
|
||||
return last_full_name.c_str();
|
||||
}
|
||||
|
||||
|
@ -39,13 +39,13 @@ void init_gettext(const char *path, const std::string &configured_language,
|
||||
void init_gettext(const char *path, const std::string &configured_language);
|
||||
#endif
|
||||
|
||||
extern wchar_t *narrow_to_wide_c(const char *str);
|
||||
extern wchar_t *utf8_to_wide_c(const char *str);
|
||||
|
||||
// You must free the returned string!
|
||||
// The returned string is allocated using new
|
||||
inline const wchar_t *wgettext(const char *str)
|
||||
{
|
||||
return narrow_to_wide_c(gettext(str));
|
||||
return utf8_to_wide_c(gettext(str));
|
||||
}
|
||||
|
||||
inline std::wstring wstrgettext(const std::string &text)
|
||||
|
@ -61,7 +61,7 @@ void TextDestGuiEngine::gotText(const StringMap &fields)
|
||||
/******************************************************************************/
|
||||
void TextDestGuiEngine::gotText(std::wstring text)
|
||||
{
|
||||
m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text));
|
||||
m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text));
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
@ -172,7 +172,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
|
||||
m_sound_manager = &dummySoundManager;
|
||||
|
||||
//create topleft header
|
||||
std::wstring t = narrow_to_wide(std::string(PROJECT_NAME_C " ") +
|
||||
std::wstring t = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
|
||||
g_version_hash);
|
||||
|
||||
core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight());
|
||||
@ -572,13 +572,13 @@ bool GUIEngine::downloadFile(std::string url, std::string target)
|
||||
/******************************************************************************/
|
||||
void GUIEngine::setTopleftText(std::string append)
|
||||
{
|
||||
std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME_C " ") +
|
||||
g_version_hash);
|
||||
std::wstring toset = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
|
||||
g_version_hash);
|
||||
|
||||
if (append != "")
|
||||
{
|
||||
toset += L" / ";
|
||||
toset += narrow_to_wide(append);
|
||||
toset += utf8_to_wide(append);
|
||||
}
|
||||
|
||||
m_irr_toplefttext->setText(toset.c_str());
|
||||
|
@ -26,7 +26,7 @@ GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
|
||||
std::string title, std::string formname) :
|
||||
GUIModalMenu(env, parent, id, menumgr)
|
||||
{
|
||||
m_title = narrow_to_wide(title);
|
||||
m_title = utf8_to_wide(title);
|
||||
m_parent = parent;
|
||||
m_formname = formname;
|
||||
m_text_dst = 0;
|
||||
@ -87,7 +87,7 @@ void GUIFileSelectMenu::acceptInput() {
|
||||
StringMap fields;
|
||||
|
||||
if (m_accepted)
|
||||
fields[m_formname + "_accepted"] = wide_to_narrow(m_fileOpenDialog->getFileName());
|
||||
fields[m_formname + "_accepted"] = wide_to_utf8(m_fileOpenDialog->getFileName());
|
||||
else
|
||||
fields[m_formname + "_canceled"] = m_formname;
|
||||
|
||||
|
@ -203,8 +203,8 @@ bool GUIPasswordChange::acceptInput()
|
||||
e->setVisible(true);
|
||||
return false;
|
||||
}
|
||||
m_client->sendChangePassword(wide_to_narrow(oldpass),
|
||||
wide_to_narrow(newpass));
|
||||
m_client->sendChangePassword(wide_to_utf8(oldpass),
|
||||
wide_to_utf8(newpass));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -929,7 +929,7 @@ s32 GUITable::allocString(const std::string &text)
|
||||
std::map<std::string, s32>::iterator it = m_alloc_strings.find(text);
|
||||
if (it == m_alloc_strings.end()) {
|
||||
s32 id = m_strings.size();
|
||||
std::wstring wtext = narrow_to_wide(text);
|
||||
std::wstring wtext = utf8_to_wide(text);
|
||||
m_strings.push_back(core::stringw(wtext.c_str()));
|
||||
m_alloc_strings.insert(std::make_pair(text, id));
|
||||
return id;
|
||||
|
10
src/hud.cpp
10
src/hud.cpp
@ -275,7 +275,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
|
||||
(e->number >> 8) & 0xFF,
|
||||
(e->number >> 0) & 0xFF);
|
||||
core::rect<s32> size(0, 0, e->scale.X, text_height * e->scale.Y);
|
||||
std::wstring text = narrow_to_wide(e->text);
|
||||
std::wstring text = utf8_to_wide(e->text);
|
||||
core::dimension2d<u32> textsize = font->getDimension(text.c_str());
|
||||
v2s32 offset((e->align.X - 1.0) * (textsize.Width / 2),
|
||||
(e->align.Y - 1.0) * (textsize.Height / 2));
|
||||
@ -310,11 +310,11 @@ void Hud::drawLuaElements(v3s16 camera_offset) {
|
||||
(e->number >> 8) & 0xFF,
|
||||
(e->number >> 0) & 0xFF);
|
||||
core::rect<s32> size(0, 0, 200, 2 * text_height);
|
||||
std::wstring text = narrow_to_wide(e->name);
|
||||
std::wstring text = utf8_to_wide(e->name);
|
||||
font->draw(text.c_str(), size + pos, color);
|
||||
std::ostringstream os;
|
||||
os<<distance<<e->text;
|
||||
text = narrow_to_wide(os.str());
|
||||
os << distance << e->text;
|
||||
text = utf8_to_wide(os.str());
|
||||
pos.Y += text_height;
|
||||
font->draw(text.c_str(), size + pos, color);
|
||||
break; }
|
||||
@ -552,7 +552,7 @@ void drawItemStack(video::IVideoDriver *driver,
|
||||
{
|
||||
// Get the item count as a string
|
||||
std::string text = itos(item.count);
|
||||
v2u32 dim = font->getDimension(narrow_to_wide(text).c_str());
|
||||
v2u32 dim = font->getDimension(utf8_to_wide(text).c_str());
|
||||
v2s32 sdim(dim.X,dim.Y);
|
||||
|
||||
core::rect<s32> rect2(
|
||||
|
@ -228,7 +228,7 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt)
|
||||
if (pkt->getSize() >= 2) {
|
||||
std::wstring wide_reason;
|
||||
*pkt >> wide_reason;
|
||||
m_access_denied_reason = wide_to_narrow(wide_reason);
|
||||
m_access_denied_reason = wide_to_utf8(wide_reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -356,7 +356,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
|
||||
DenyAccess_Legacy(pkt->getPeerId(), std::wstring(
|
||||
L"Your client's version is not supported.\n"
|
||||
L"Server version is ")
|
||||
+ narrow_to_wide(g_version_string) + L"."
|
||||
+ utf8_to_wide(g_version_string) + L"."
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -408,15 +408,15 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
|
||||
DenyAccess_Legacy(pkt->getPeerId(), std::wstring(
|
||||
L"Your client's version is not supported.\n"
|
||||
L"Server version is ")
|
||||
+ narrow_to_wide(g_version_string) + L",\n"
|
||||
+ utf8_to_wide(g_version_string) + L",\n"
|
||||
+ L"server's PROTOCOL_VERSION is "
|
||||
+ narrow_to_wide(itos(SERVER_PROTOCOL_VERSION_MIN))
|
||||
+ utf8_to_wide(itos(SERVER_PROTOCOL_VERSION_MIN))
|
||||
+ L"..."
|
||||
+ narrow_to_wide(itos(SERVER_PROTOCOL_VERSION_MAX))
|
||||
+ utf8_to_wide(itos(SERVER_PROTOCOL_VERSION_MAX))
|
||||
+ L", client's PROTOCOL_VERSION is "
|
||||
+ narrow_to_wide(itos(min_net_proto_version))
|
||||
+ utf8_to_wide(itos(min_net_proto_version))
|
||||
+ L"..."
|
||||
+ narrow_to_wide(itos(max_net_proto_version))
|
||||
+ utf8_to_wide(itos(max_net_proto_version))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -428,13 +428,13 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
|
||||
DenyAccess_Legacy(pkt->getPeerId(), std::wstring(
|
||||
L"Your client's version is not supported.\n"
|
||||
L"Server version is ")
|
||||
+ narrow_to_wide(g_version_string) + L",\n"
|
||||
+ utf8_to_wide(g_version_string) + L",\n"
|
||||
+ L"server's PROTOCOL_VERSION (strict) is "
|
||||
+ narrow_to_wide(itos(LATEST_PROTOCOL_VERSION))
|
||||
+ utf8_to_wide(itos(LATEST_PROTOCOL_VERSION))
|
||||
+ L", client's PROTOCOL_VERSION is "
|
||||
+ narrow_to_wide(itos(min_net_proto_version))
|
||||
+ utf8_to_wide(itos(min_net_proto_version))
|
||||
+ L"..."
|
||||
+ narrow_to_wide(itos(max_net_proto_version))
|
||||
+ utf8_to_wide(itos(max_net_proto_version))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -487,7 +487,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
|
||||
<< "tried to connect from " << addr_s << " "
|
||||
<< "but it was disallowed for the following reason: "
|
||||
<< reason << std::endl;
|
||||
DenyAccess_Legacy(pkt->getPeerId(), narrow_to_wide(reason.c_str()));
|
||||
DenyAccess_Legacy(pkt->getPeerId(), utf8_to_wide(reason.c_str()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -1057,7 +1057,7 @@ int ModApiMainMenu::l_get_video_modes(lua_State *L)
|
||||
int ModApiMainMenu::l_gettext(lua_State *L)
|
||||
{
|
||||
std::wstring wtext = wstrgettext((std::string) luaL_checkstring(L, 1));
|
||||
lua_pushstring(L, wide_to_narrow(wtext).c_str());
|
||||
lua_pushstring(L, wide_to_utf8(wtext).c_str());
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -307,7 +307,7 @@ int ModApiServer::l_kick_player(lua_State *L)
|
||||
lua_pushboolean(L, false); // No such player
|
||||
return 1;
|
||||
}
|
||||
getServer(L)->DenyAccess_Legacy(player->peer_id, narrow_to_wide(message));
|
||||
getServer(L)->DenyAccess_Legacy(player->peer_id, utf8_to_wide(message));
|
||||
lua_pushboolean(L, true);
|
||||
return 1;
|
||||
}
|
||||
|
@ -1183,7 +1183,7 @@ void Server::ProcessData(NetworkPacket *pkt)
|
||||
<< ban_name << std::endl;
|
||||
// This actually doesn't seem to transfer to the client
|
||||
DenyAccess_Legacy(peer_id, L"Your ip is banned. Banned name was "
|
||||
+ narrow_to_wide(ban_name));
|
||||
+ utf8_to_wide(ban_name));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -102,7 +102,7 @@ void TestSerialization::testSerializeWideString()
|
||||
UASSERT(serializeWideString(L"") == mkstr("\0\0"));
|
||||
|
||||
// Test basic string
|
||||
UASSERT(serializeWideString(narrow_to_wide("Hello world!")) ==
|
||||
UASSERT(serializeWideString(utf8_to_wide("Hello world!")) ==
|
||||
mkstr("\0\14\0H\0e\0l\0l\0o\0 \0w\0o\0r\0l\0d\0!"));
|
||||
|
||||
// Test character range
|
||||
|
@ -168,6 +168,16 @@ std::string wide_to_utf8(const std::wstring &input)
|
||||
|
||||
#endif // _WIN32
|
||||
|
||||
wchar_t *utf8_to_wide_c(const char *str)
|
||||
{
|
||||
std::wstring ret = utf8_to_wide(std::string(str)).c_str();
|
||||
size_t len = ret.length();
|
||||
wchar_t *ret_c = new wchar_t[len + 1];
|
||||
memset(ret_c, 0, (len + 1) * sizeof(wchar_t));
|
||||
memcpy(ret_c, ret.c_str(), len * sizeof(wchar_t));
|
||||
return ret_c;
|
||||
}
|
||||
|
||||
// You must free the returned string!
|
||||
// The returned string is allocated using new
|
||||
wchar_t *narrow_to_wide_c(const char *str)
|
||||
|
@ -47,6 +47,8 @@ struct FlagDesc {
|
||||
std::wstring utf8_to_wide(const std::string &input);
|
||||
std::string wide_to_utf8(const std::wstring &input);
|
||||
|
||||
wchar_t *utf8_to_wide_c(const char *str);
|
||||
|
||||
// NEVER use those two functions unless you have a VERY GOOD reason to
|
||||
// they just convert between wide and multibyte encoding
|
||||
// multibyte encoding depends on current locale, this is no good, especially on Windows
|
||||
|
Loading…
Reference in New Issue
Block a user