Add dtime_s to entity activation

[dragonfireclient.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 30d1dd5a283997aff0601afd5a413955a1899784..cdf3c6062dde7aad2e5c7a0d77c8ce4c1b6bc2d6 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -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,9 +260,10 @@ KeyPress::KeyPress(const char *name)
                try {
                        Key = keyname_to_keycode(name);
                        m_name = name;
-                       if (strlen(name) > 8)
-                               mbtowc(&Char, name + 8, 1);
-                       else
+                       if (strlen(name) > 8) {
+                               int chars_read = mbtowc(&Char, name + 8, 1);
+                               assert (chars_read == 1 && "unexpected multibyte character");
+                       } else
                                Char = L'\0';
                        return;
                } catch (UnknownKeycode &e) {};
@@ -270,7 +273,8 @@ 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);
+                       assert (chars_read == 1 && "unexpected multibyte character");
                        return;
                } catch (UnknownKeycode &e) {};
        }
@@ -279,20 +283,35 @@ KeyPress::KeyPress(const char *name)
 
        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;
+               }
        }
 }