summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/guiKeyChangeMenu.cpp22
-rw-r--r--src/guiKeyChangeMenu.h2
-rw-r--r--src/keycode.cpp15
-rw-r--r--src/keycode.h2
4 files changed, 35 insertions, 6 deletions
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index a7dbc8c6f..49b292df4 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -60,6 +60,7 @@ GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id, IMenuManager *menumgr) :
GUIModalMenu(env, parent, id, menumgr)
{
+ shift_down = false;
activeKey = -1;
this->key_used_text = NULL;
init_keys();
@@ -204,7 +205,15 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
&& event.KeyInput.PressedDown)
{
changeCtype("");
- KeyPress kp(event.KeyInput);
+ bool prefer_character = shift_down;
+ KeyPress kp(event.KeyInput, prefer_character);
+
+ bool shift_went_down = false;
+ if(!shift_down &&
+ (event.KeyInput.Key == irr::KEY_SHIFT ||
+ event.KeyInput.Key == irr::KEY_LSHIFT ||
+ event.KeyInput.Key == irr::KEY_RSHIFT))
+ shift_went_down = true;
// Remove Key already in use message
if(this->key_used_text)
@@ -240,8 +249,14 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
this->key_used.push_back(kp);
changeCtype("C");
- activeKey = -1;
- return true;
+ // Allow characters made with shift
+ if(shift_went_down){
+ shift_down = true;
+ return false;
+ }else{
+ activeKey = -1;
+ return true;
+ }
}
}
if (event.EventType == EET_GUI_EVENT)
@@ -287,6 +302,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
assert(k);
resetMenu();
+ shift_down = false;
activeKey = event.GUIEvent.Caller->getID();
k->button->setText(wgettext("press key"));
this->key_used.erase(std::remove(this->key_used.begin(),
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index b81866983..beb4f0b6f 100644
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -66,6 +66,8 @@ private:
void add_key(int id, std::string setting_name, std::string button_name);
+ bool shift_down;
+
s32 activeKey;
std::vector<KeyPress> key_used;
diff --git a/src/keycode.cpp b/src/keycode.cpp
index 5a8df0db4..cdf3c6062 100644
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -288,16 +288,27 @@ 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 {
m_name.resize(MB_CUR_MAX+1, '\0');
int written = wctomb(&m_name[0], Char);
- if(written >= 0){
+ if(written < 0){
std::string hexstr = hex_encode((const char*)&Char, sizeof(Char));
errorstream<<"KeyPress: Unexpected multibyte character "<<hexstr<<std::endl;
}
diff --git a/src/keycode.h b/src/keycode.h
index 4105d43b8..a0b1e3553 100644
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -33,7 +33,7 @@ public:
KeyPress();
KeyPress(const char *name);
- KeyPress(const irr::SEvent::SKeyInput &in);
+ KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character=false);
bool operator==(const KeyPress &o) const
{