/*
-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 "keycode.h"
-#include "main.h" // For g_settings
#include "exceptions.h"
#include "settings.h"
#include "log.h"
-#include "hex.h"
+#include "debug.h"
+#include "util/hex.h"
class UnknownKeycode : public BaseException
{
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) {
+ 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");
+
+ FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
} else
Char = L'\0';
return;
try {
Key = keyname_to_keycode(m_name.c_str());
int chars_read = mbtowc(&Char, name, 1);
- assert (chars_read == 1 && "unexpected multibyte character");
+
+ FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
return;
} catch (UnknownKeycode &e) {};
}
Key = irr::KEY_KEY_CODES_COUNT;
int mbtowc_ret = mbtowc(&Char, name, 1);
- assert (mbtowc_ret == 1 && "unexpected multibyte character");
+ FATAL_ERROR_IF(mbtowc_ret != 1, "Unexpected multibyte character");
m_name = name[0];
}
}
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"),
*/
// 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()