Fix doc and forceloading crash.

[dragonfireclient.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index c3c06bb7f7b96d5b14a6522483852392d482d5c0..96631b4eaf1e158d408769350fff538505b34a31 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -1,6 +1,6 @@
 /*
-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
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "main.h" // For g_settings
 #include "exceptions.h"
 #include "settings.h"
+#include "log.h"
+#include "hex.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -258,7 +260,7 @@ KeyPress::KeyPress(const char *name)
                try {
                        Key = keyname_to_keycode(name);
                        m_name = name;
-                       if (strlen(name) > 8) {
+                       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
@@ -286,17 +288,30 @@ KeyPress::KeyPress(const char *name)
        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');
+               m_name.resize(MB_CUR_MAX+1, '\0');
                int written = wctomb(&m_name[0], Char);
-               assert (written >= 0 && "unexpected multibyte character");
+               if(written < 0){
+                       std::string hexstr = hex_encode((const char*)&Char, sizeof(Char));
+                       errorstream<<"KeyPress: Unexpected multibyte character "<<hexstr<<std::endl;
+               }
        }
 }
 
@@ -330,17 +345,16 @@ const KeyPress NumberKey[] = {
 */
 
 // 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()