/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
#include "main.h" // For g_settings
#include "exceptions.h"
#include "settings.h"
+#include "log.h"
+#include "hex.h"
class UnknownKeycode : public BaseException
{
try {
Key = keyname_to_keycode(name);
m_name = name;
- if (strlen(name) > 8)
- mbtowc(&Char, name + 8, 1);
- else
+ if (strlen(name) > 8 && strncmp(name, "KEY_KEY_", 8) == 0) {
+ int chars_read = mbtowc(&Char, name + 8, 1);
+ assert (chars_read == 1 && "unexpected multibyte character");
+ } else
Char = L'\0';
return;
} catch (UnknownKeycode &e) {};
m_name += name;
try {
Key = keyname_to_keycode(m_name.c_str());
- mbtowc(&Char, name, 1);
+ int chars_read = mbtowc(&Char, name, 1);
+ assert (chars_read == 1 && "unexpected multibyte character");
return;
} catch (UnknownKeycode &e) {};
}
Key = irr::KEY_KEY_CODES_COUNT;
- mbtowc(&Char, name, 1);
+ int mbtowc_ret = mbtowc(&Char, name, 1);
+ assert (mbtowc_ret == 1 && "unexpected multibyte character");
m_name = name[0];
}
-KeyPress::KeyPress(const irr::SEvent::SKeyInput &in)
+KeyPress::KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character)
{
Key = in.Key;
Char = in.Char;
+
+ if(prefer_character){
+ m_name.resize(MB_CUR_MAX+1, '\0');
+ int written = wctomb(&m_name[0], Char);
+ if(written > 0){
+ infostream<<"KeyPress: Preferring character for "<<m_name<<std::endl;
+ Key = irr::KEY_KEY_CODES_COUNT;
+ return;
+ }
+ }
+
if (valid_kcode(Key)) {
m_name = KeyNames[Key];
} else {
- size_t maxlen = wctomb(NULL, Char);
- m_name.resize(maxlen+1, '\0');
- wctomb(&m_name[0], Char);
+ m_name.resize(MB_CUR_MAX+1, '\0');
+ int written = wctomb(&m_name[0], Char);
+ if(written < 0){
+ std::string hexstr = hex_encode((const char*)&Char, sizeof(Char));
+ errorstream<<"KeyPress: Unexpected multibyte character "<<hexstr<<std::endl;
+ }
}
}
*/
// A simple cache for quicker lookup
-core::map<std::string, KeyPress> g_key_setting_cache;
+std::map<std::string, KeyPress> g_key_setting_cache;
KeyPress getKeySetting(const char *settingname)
{
- core::map<std::string, KeyPress>::Node *n;
+ std::map<std::string, KeyPress>::iterator n;
n = g_key_setting_cache.find(settingname);
- if(n)
- return n->getValue();
- g_key_setting_cache.insert(settingname,
- g_settings->get(settingname).c_str());
- return g_key_setting_cache.find(settingname)->getValue();
+ if(n != g_key_setting_cache.end())
+ return n->second;
+ g_key_setting_cache[settingname] = g_settings->get(settingname).c_str();
+ return g_key_setting_cache.find(settingname)->second;
}
void clearKeyCache()