Show infotext with description for item entities

[oweals/minetest.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index df2023074d3c56668f1486c05423ebeda2170109..990dee339df12113ec3e5d059e7869c7d1984ffb 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -1,26 +1,28 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "keycode.h"
-#include "main.h" // For g_settings
 #include "exceptions.h"
 #include "settings.h"
+#include "log.h"
+#include "debug.h"
+#include "util/hex.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -254,13 +256,19 @@ KeyPress::KeyPress() :
 
 KeyPress::KeyPress(const char *name)
 {
-       if (strlen(name) > 4) {
+       if (name[0] == 0) {
+               Key = irr::KEY_KEY_CODES_COUNT;
+               Char = L'\0';
+               return;
+       } else if (strlen(name) > 4) {
                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);
+
+                               FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
+                       } else
                                Char = L'\0';
                        return;
                } catch (UnknownKeycode &e) {};
@@ -270,7 +278,9 @@ KeyPress::KeyPress(const char *name)
                m_name += name;
                try {
                        Key = keyname_to_keycode(m_name.c_str());
-                       mbtowc(&Char, name, 1);
+                       int chars_read = mbtowc(&Char, name, 1);
+
+                       FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
                        return;
                } catch (UnknownKeycode &e) {};
        }
@@ -279,20 +289,35 @@ KeyPress::KeyPress(const char *name)
 
        Key = irr::KEY_KEY_CODES_COUNT;
 
-       mbtowc(&Char, name, 1);
+       int mbtowc_ret = mbtowc(&Char, name, 1);
+       FATAL_ERROR_IF(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;
+               }
        }
 }
 
@@ -315,6 +340,7 @@ const char *KeyPress::name() const
 }
 
 const KeyPress EscapeKey("KEY_ESCAPE");
+const KeyPress CancelKey("KEY_CANCEL");
 const KeyPress NumberKey[] = {
        KeyPress("KEY_KEY_0"), KeyPress("KEY_KEY_1"), KeyPress("KEY_KEY_2"),
        KeyPress("KEY_KEY_3"), KeyPress("KEY_KEY_4"), KeyPress("KEY_KEY_5"),
@@ -326,17 +352,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()