]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/guiKeyChangeMenu.cpp
Make use of safe file writing in auth handler (fixes #6576)
[dragonfireclient.git] / src / guiKeyChangeMenu.cpp
index 4e04fccf0e1406c0268dcf2fc8bd58908a9e95d3..53677a57bfb4a2f6fed7bd42d78658427d7c0cea 100644 (file)
@@ -1,20 +1,20 @@
 /*
- Minetest-c55
- Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
- Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
- Copyright (C) 2011 teddydestodes <derkomtur@schattengang.net>
+ Minetest
+ Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+ Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>
+ Copyright (C) 2013 teddydestodes <derkomtur@schattengang.net>
 
  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.
  */
@@ -22,7 +22,6 @@
 #include "guiKeyChangeMenu.h"
 #include "debug.h"
 #include "serialization.h"
-#include "main.h"
 #include <string>
 #include <IGUICheckBox.h>
 #include <IGUIEditBox.h>
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
 #include "settings.h"
+#include <algorithm>
+
+#include "mainmenumanager.h"  // for g_gamecallback
+
+#define KMaxButtonPerColumns 12
+
+extern MainGameCallback *g_gamecallback;
+
+enum
+{
+       GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
+       // buttons
+       GUI_ID_KEY_FORWARD_BUTTON,
+       GUI_ID_KEY_BACKWARD_BUTTON,
+       GUI_ID_KEY_LEFT_BUTTON,
+       GUI_ID_KEY_RIGHT_BUTTON,
+       GUI_ID_KEY_USE_BUTTON,
+       GUI_ID_KEY_FLY_BUTTON,
+       GUI_ID_KEY_FAST_BUTTON,
+       GUI_ID_KEY_JUMP_BUTTON,
+       GUI_ID_KEY_NOCLIP_BUTTON,
+       GUI_ID_KEY_CINEMATIC_BUTTON,
+       GUI_ID_KEY_CHAT_BUTTON,
+       GUI_ID_KEY_CMD_BUTTON,
+       GUI_ID_KEY_CMD_LOCAL_BUTTON,
+       GUI_ID_KEY_CONSOLE_BUTTON,
+       GUI_ID_KEY_SNEAK_BUTTON,
+       GUI_ID_KEY_DROP_BUTTON,
+       GUI_ID_KEY_INVENTORY_BUTTON,
+       GUI_ID_KEY_HOTBAR_PREV_BUTTON,
+       GUI_ID_KEY_HOTBAR_NEXT_BUTTON,
+       GUI_ID_KEY_MUTE_BUTTON,
+       GUI_ID_KEY_DEC_VOLUME_BUTTON,
+       GUI_ID_KEY_INC_VOLUME_BUTTON,
+       GUI_ID_KEY_RANGE_BUTTON,
+       GUI_ID_KEY_ZOOM_BUTTON,
+       GUI_ID_KEY_CAMERA_BUTTON,
+       GUI_ID_KEY_MINIMAP_BUTTON,
+       GUI_ID_KEY_SCREENSHOT_BUTTON,
+       GUI_ID_KEY_CHATLOG_BUTTON,
+       GUI_ID_KEY_HUD_BUTTON,
+       GUI_ID_KEY_FOG_BUTTON,
+       GUI_ID_KEY_DEC_RANGE_BUTTON,
+       GUI_ID_KEY_INC_RANGE_BUTTON,
+       GUI_ID_KEY_AUTOFWD_BUTTON,
+       // other
+       GUI_ID_CB_AUX1_DESCENDS,
+       GUI_ID_CB_DOUBLETAP_JUMP,
+};
 
 GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
-               gui::IGUIElement* parent, s32 id, IMenuManager *menumgr) :
-       GUIModalMenu(env, parent, id, menumgr)
+                               gui::IGUIElement* parent, s32 id, IMenuManager *menumgr) :
+GUIModalMenu(env, parent, id, menumgr)
 {
-       activeKey = -1;
        init_keys();
+       for (key_setting *ks : key_settings)
+               key_used.push_back(ks->key);
 }
 
 GUIKeyChangeMenu::~GUIKeyChangeMenu()
 {
        removeChildren();
+
+       for (key_setting *ks : key_settings) {
+               delete[] ks->button_name;
+               delete ks;
+       }
+       key_settings.clear();
 }
 
 void GUIKeyChangeMenu::removeChildren()
 {
        const core::list<gui::IGUIElement*> &children = getChildren();
        core::list<gui::IGUIElement*> children_copy;
-       for (core::list<gui::IGUIElement*>::ConstIterator i = children.begin(); i
-                       != children.end(); i++)
-       {
-               children_copy.push_back(*i);
+       for (gui::IGUIElement*i : children) {
+               children_copy.push_back(i);
        }
-       for (core::list<gui::IGUIElement*>::Iterator i = children_copy.begin(); i
-                       != children_copy.end(); i++)
-       {
-               (*i)->remove();
+
+       for (gui::IGUIElement *i : children_copy) {
+               i->remove();
        }
 }
 
 void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 {
-       /*
-        Remove stuff
-        */
        removeChildren();
-
-       /*
-        Calculate new sizes and positions
-        */
-
-       v2s32 size(620, 430);
+       v2s32 size(745, 430);
 
        core::rect < s32 > rect(screensize.X / 2 - size.X / 2,
-                       screensize.Y / 2 - size.Y / 2, screensize.X / 2 + size.X / 2,
-                       screensize.Y / 2 + size.Y / 2);
+                                                       screensize.Y / 2 - size.Y / 2, screensize.X / 2 + size.X / 2,
+                                                       screensize.Y / 2 + size.Y / 2);
 
        DesiredRect = rect;
        recalculateAbsolutePosition(false);
 
        v2s32 topleft(0, 0);
-       changeCtype("");
+
        {
-               core::rect < s32 > rect(0, 0, 125, 20);
+               core::rect < s32 > rect(0, 0, 600, 40);
                rect += topleft + v2s32(25, 3);
                //gui::IGUIStaticText *t =
-               Environment->addStaticText(wgettext("KEYBINDINGS"),
-                               rect, false, true, this, -1);
+               const wchar_t *text = wgettext("Keybindings. (If this menu screws up, remove stuff from minetest.conf)");
+               Environment->addStaticText(text,
+                                                                  rect, false, true, this, -1);
+               delete[] text;
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
-       v2s32 offset(25, 40);
-       // buttons
 
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Forward"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
+       // Build buttons
 
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->forward = Environment->addButton(rect, this,
-                               GUI_ID_KEY_FORWARD_BUTTON,
-                               wgettext(key_forward.name()));
-       }
-
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Backward"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->backward = Environment->addButton(rect, this,
-                               GUI_ID_KEY_BACKWARD_BUTTON,
-                               wgettext(key_backward.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Left"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->left = Environment->addButton(rect, this, GUI_ID_KEY_LEFT_BUTTON,
-                               wgettext(key_left.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Right"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->right = Environment->addButton(rect, this,
-                               GUI_ID_KEY_RIGHT_BUTTON,
-                               wgettext(key_right.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Use"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->use = Environment->addButton(rect, this, GUI_ID_KEY_USE_BUTTON,
-                               wgettext(key_use.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Sneak"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->sneak = Environment->addButton(rect, this,
-                               GUI_ID_KEY_SNEAK_BUTTON,
-                               wgettext(key_sneak.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Jump"), rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->jump = Environment->addButton(rect, this, GUI_ID_KEY_JUMP_BUTTON,
-                               wgettext(key_jump.name()));
-       }
-
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Drop"), rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->dropbtn = Environment->addButton(rect, this, GUI_ID_KEY_DROP_BUTTON,
-                               wgettext(key_drop.name()));
-       }
-
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Inventory"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->inventory = Environment->addButton(rect, this,
-                               GUI_ID_KEY_INVENTORY_BUTTON,
-                               wgettext(key_inventory.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Chat"), rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->chat = Environment->addButton(rect, this, GUI_ID_KEY_CHAT_BUTTON,
-                               wgettext(key_chat.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Command"), rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->cmd = Environment->addButton(rect, this, GUI_ID_KEY_CMD_BUTTON,
-                               wgettext(key_cmd.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Console"), rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
-
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->console = Environment->addButton(rect, this, GUI_ID_KEY_CONSOLE_BUTTON,
-                               wgettext(key_console.name()));
-       }
-
-       //next col
-       offset = v2s32(250, 40);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Toggle fly"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
+       v2s32 offset(25, 60);
 
+       for(size_t i = 0; i < key_settings.size(); i++)
        {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->fly = Environment->addButton(rect, this, GUI_ID_KEY_FLY_BUTTON,
-                               wgettext(key_fly.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Toggle fast"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
-       }
+               key_setting *k = key_settings.at(i);
+               {
+                       core::rect < s32 > rect(0, 0, 150, 20);
+                       rect += topleft + v2s32(offset.X, offset.Y);
+                       Environment->addStaticText(k->button_name, rect, false, true, this, -1);
+               }
 
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->fast = Environment->addButton(rect, this, GUI_ID_KEY_FAST_BUTTON,
-                               wgettext(key_fast.name()));
-       }
-       offset += v2s32(0, 25);
-       {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Range select"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+               {
+                       core::rect < s32 > rect(0, 0, 100, 30);
+                       rect += topleft + v2s32(offset.X + 120, offset.Y - 5);
+                       const wchar_t *text = wgettext(k->key.name());
+                       k->button = Environment->addButton(rect, this, k->id, text);
+                       delete[] text;
+               }
+               if ((i + 1) % KMaxButtonPerColumns == 0) {
+                       offset.X += 230;
+                       offset.Y = 60;
+               } else {
+                       offset += v2s32(0, 25);
+               }
        }
 
        {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->range = Environment->addButton(rect, this,
-                               GUI_ID_KEY_RANGE_BUTTON,
-                               wgettext(key_range.name()));
+               s32 option_x = offset.X;
+               s32 option_y = offset.Y + 5;
+               u32 option_w = 180;
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += topleft + v2s32(option_x, option_y);
+                       const wchar_t *text = wgettext("\"Special\" = climb down");
+                       Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this,
+                                       GUI_ID_CB_AUX1_DESCENDS, text);
+                       delete[] text;
+               }
+               offset += v2s32(0, 25);
        }
 
-       offset += v2s32(0, 25);
        {
-               core::rect < s32 > rect(0, 0, 100, 20);
-               rect += topleft + v2s32(offset.X, offset.Y);
-               Environment->addStaticText(wgettext("Print stacks"),
-                               rect, false, true, this, -1);
-               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+               s32 option_x = offset.X;
+               s32 option_y = offset.Y + 5;
+               u32 option_w = 280;
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += topleft + v2s32(option_x, option_y);
+                       const wchar_t *text = wgettext("Double tap \"jump\" to toggle fly");
+                       Environment->addCheckBox(g_settings->getBool("doubletap_jump"), rect, this,
+                                       GUI_ID_CB_DOUBLETAP_JUMP, text);
+                       delete[] text;
+               }
+               offset += v2s32(0, 25);
        }
 
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
-               this->dump = Environment->addButton(rect, this, GUI_ID_KEY_DUMP_BUTTON,
-                               wgettext(key_dump.name()));
-       }
-       {
-               core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 - 105, size.Y - 40);
+               const wchar_t *text =  wgettext("Save");
                Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
-               wgettext("Save"));
+                                text);
+               delete[] text;
        }
        {
                core::rect < s32 > rect(0, 0, 100, 30);
-               rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
+               rect += topleft + v2s32(size.X / 2 + 5, size.Y - 40);
+               const wchar_t *text = wgettext("Cancel");
                Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
-               wgettext("Cancel"));
+                               text);
+               delete[] text;
        }
-       changeCtype("C");
 }
 
 void GUIKeyChangeMenu::drawMenu()
@@ -364,7 +223,7 @@ void GUIKeyChangeMenu::drawMenu()
        video::SColor bgcolor(140, 0, 0, 0);
 
        {
-               core::rect < s32 > rect(0, 0, 620, 620);
+               core::rect < s32 > rect(0, 0, 745, 620);
                rect += AbsoluteRect.UpperLeftCorner;
                driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
        }
@@ -374,102 +233,39 @@ void GUIKeyChangeMenu::drawMenu()
 
 bool GUIKeyChangeMenu::acceptInput()
 {
-       g_settings->set("keymap_forward", key_forward.sym());
-       g_settings->set("keymap_backward", key_backward.sym());
-       g_settings->set("keymap_left", key_left.sym());
-       g_settings->set("keymap_right", key_right.sym());
-       g_settings->set("keymap_jump", key_jump.sym());
-       g_settings->set("keymap_sneak", key_sneak.sym());
-       g_settings->set("keymap_drop", key_drop.sym());
-       g_settings->set("keymap_inventory", key_inventory.sym());
-       g_settings->set("keymap_chat", key_chat.sym());
-       g_settings->set("keymap_cmd", key_cmd.sym());
-       g_settings->set("keymap_console", key_console.sym());
-       g_settings->set("keymap_rangeselect", key_range.sym());
-       g_settings->set("keymap_freemove", key_fly.sym());
-       g_settings->set("keymap_fastmove", key_fast.sym());
-       g_settings->set("keymap_special1", key_use.sym());
-       g_settings->set("keymap_print_debug_stacks", key_dump.sym());
+       for (key_setting *k : key_settings) {
+               g_settings->set(k->setting_name, k->key.sym());
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_CB_AUX1_DESCENDS);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       g_settings->setBool("aux1_descends", ((gui::IGUICheckBox*)e)->isChecked());
+       }
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_CB_DOUBLETAP_JUMP);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       g_settings->setBool("doubletap_jump", ((gui::IGUICheckBox*)e)->isChecked());
+       }
+
        clearKeyCache();
+
+       g_gamecallback->signalKeyConfigChange();
+
        return true;
 }
-void GUIKeyChangeMenu::init_keys()
-{
-       key_forward = getKeySetting("keymap_forward");
-       key_backward = getKeySetting("keymap_backward");
-       key_left = getKeySetting("keymap_left");
-       key_right = getKeySetting("keymap_right");
-       key_jump = getKeySetting("keymap_jump");
-       key_sneak = getKeySetting("keymap_sneak");
-       key_drop = getKeySetting("keymap_drop");
-       key_inventory = getKeySetting("keymap_inventory");
-       key_chat = getKeySetting("keymap_chat");
-       key_cmd = getKeySetting("keymap_cmd");
-       key_console = getKeySetting("keymap_console");
-       key_range = getKeySetting("keymap_rangeselect");
-       key_fly = getKeySetting("keymap_freemove");
-       key_fast = getKeySetting("keymap_fastmove");
-       key_use = getKeySetting("keymap_special1");
-       key_dump = getKeySetting("keymap_print_debug_stacks");
-}
 
 bool GUIKeyChangeMenu::resetMenu()
 {
        if (activeKey >= 0)
        {
-               switch (activeKey)
-               {
-               case GUI_ID_KEY_FORWARD_BUTTON:
-                       this->forward->setText(
-                                       wgettext(key_forward.name()));
-                       break;
-               case GUI_ID_KEY_BACKWARD_BUTTON:
-                       this->backward->setText(
-                                       wgettext(key_backward.name()));
-                       break;
-               case GUI_ID_KEY_LEFT_BUTTON:
-                       this->left->setText(wgettext(key_left.name()));
-                       break;
-               case GUI_ID_KEY_RIGHT_BUTTON:
-                       this->right->setText(wgettext(key_right.name()));
-                       break;
-               case GUI_ID_KEY_JUMP_BUTTON:
-                       this->jump->setText(wgettext(key_jump.name()));
-                       break;
-               case GUI_ID_KEY_SNEAK_BUTTON:
-                       this->sneak->setText(wgettext(key_sneak.name()));
-                       break;
-               case GUI_ID_KEY_DROP_BUTTON:
-                       this->dropbtn->setText(wgettext(key_drop.name()));
-                       break;
-               case GUI_ID_KEY_INVENTORY_BUTTON:
-                       this->inventory->setText(
-                                       wgettext(key_inventory.name()));
-                       break;
-               case GUI_ID_KEY_CHAT_BUTTON:
-                       this->chat->setText(wgettext(key_chat.name()));
-                       break;
-               case GUI_ID_KEY_CMD_BUTTON:
-                       this->cmd->setText(wgettext(key_cmd.name()));
-                       break;
-               case GUI_ID_KEY_CONSOLE_BUTTON:
-                       this->console->setText(wgettext(key_console.name()));
-                       break;
-               case GUI_ID_KEY_RANGE_BUTTON:
-                       this->range->setText(wgettext(key_range.name()));
-                       break;
-               case GUI_ID_KEY_FLY_BUTTON:
-                       this->fly->setText(wgettext(key_fly.name()));
-                       break;
-               case GUI_ID_KEY_FAST_BUTTON:
-                       this->fast->setText(wgettext(key_fast.name()));
-                       break;
-               case GUI_ID_KEY_USE_BUTTON:
-                       this->use->setText(wgettext(key_use.name()));
-                       break;
-               case GUI_ID_KEY_DUMP_BUTTON:
-                       this->dump->setText(wgettext(key_dump.name()));
-                       break;
+               for (key_setting *k : key_settings) {
+                       if (k->id == activeKey) {
+                               const wchar_t *text = wgettext(k->key.name());
+                               k->button->setText(text);
+                               delete[] text;
+                               break;
+                       }
                }
                activeKey = -1;
                return false;
@@ -479,211 +275,162 @@ bool GUIKeyChangeMenu::resetMenu()
 bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 {
        if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0
-                       && event.KeyInput.PressedDown)
-       {
-               changeCtype("");
-               KeyPress kp(event.KeyInput);
+                       && event.KeyInput.PressedDown) {
 
-               if (activeKey == GUI_ID_KEY_FORWARD_BUTTON)
-               {
-                       this->forward->setText(wgettext(kp.name()));
-                       this->key_forward = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_BACKWARD_BUTTON)
-               {
-                       this->backward->setText(wgettext(kp.name()));
-                       this->key_backward = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_LEFT_BUTTON)
-               {
-                       this->left->setText(wgettext(kp.name()));
-                       this->key_left = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_RIGHT_BUTTON)
-               {
-                       this->right->setText(wgettext(kp.name()));
-                       this->key_right = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_JUMP_BUTTON)
-               {
-                       this->jump->setText(wgettext(kp.name()));
-                       this->key_jump = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_SNEAK_BUTTON)
-               {
-                       this->sneak->setText(wgettext(kp.name()));
-                       this->key_sneak = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_DROP_BUTTON)
-               {
-                       this->dropbtn->setText(wgettext(kp.name()));
-                       this->key_drop = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_INVENTORY_BUTTON)
-               {
-                       this->inventory->setText(wgettext(kp.name()));
-                       this->key_inventory = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_CHAT_BUTTON)
-               {
-                       this->chat->setText(wgettext(kp.name()));
-                       this->key_chat = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_CMD_BUTTON)
-               {
-                       this->cmd->setText(wgettext(kp.name()));
-                       this->key_cmd = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_CONSOLE_BUTTON)
-               {
-                       this->console->setText(wgettext(kp.name()));
-                       this->key_console = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_RANGE_BUTTON)
-               {
-                       this->range->setText(wgettext(kp.name()));
-                       this->key_range = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_FLY_BUTTON)
-               {
-                       this->fly->setText(wgettext(kp.name()));
-                       this->key_fly = kp;
-               }
-               else if (activeKey == GUI_ID_KEY_FAST_BUTTON)
+               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)
                {
-                       this->fast->setText(wgettext(kp.name()));
-                       this->key_fast = kp;
+                       this->key_used_text->remove();
+                       this->key_used_text = NULL;
                }
-               else if (activeKey == GUI_ID_KEY_USE_BUTTON)
+               // Display Key already in use message
+               if (std::find(this->key_used.begin(), this->key_used.end(), kp) != this->key_used.end())
                {
-                       this->use->setText(wgettext(kp.name()));
-                       this->key_use = kp;
+                       core::rect < s32 > rect(0, 0, 600, 40);
+                       rect += v2s32(0, 0) + v2s32(25, 30);
+                       const wchar_t *text = wgettext("Key already in use");
+                       this->key_used_text = Environment->addStaticText(text,
+                                       rect, false, true, this, -1);
+                       delete[] text;
+                       //infostream << "Key already in use" << std::endl;
                }
-               else if (activeKey == GUI_ID_KEY_DUMP_BUTTON)
+
+               // But go on
                {
-                       this->dump->setText(wgettext(kp.name()));
-                       this->key_dump = kp;
+                       key_setting *k = NULL;
+                       for (key_setting *ks : key_settings) {
+                               if (ks->id == activeKey) {
+                                       k = ks;
+                                       break;
+                               }
+                       }
+                       FATAL_ERROR_IF(k == NULL, "Key setting not found");
+                       k->key = kp;
+                       const wchar_t *text = wgettext(k->key.name());
+                       k->button->setText(text);
+                       delete[] text;
+
+                       this->key_used.push_back(kp);
+
+                       // Allow characters made with shift
+                       if(shift_went_down){
+                               shift_down = true;
+                               return false;
+                       }
+
+                       activeKey = -1;
+                       return true;
                }
-               changeCtype("C");
-               activeKey = -1;
+       } else if (event.EventType == EET_KEY_INPUT_EVENT && activeKey < 0
+                       && event.KeyInput.PressedDown
+                       && event.KeyInput.Key == irr::KEY_ESCAPE) {
+               quitMenu();
                return true;
-       }
-       if (event.EventType == EET_GUI_EVENT)
-       {
+       } else if (event.EventType == EET_GUI_EVENT) {
                if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST
-                               && isVisible())
+                       && isVisible())
                {
                        if (!canTakeFocus(event.GUIEvent.Element))
                        {
                                dstream << "GUIMainMenu: Not allowing focus change."
-                                               << std::endl;
+                               << std::endl;
                                // Returning true disables focus change
                                return true;
                        }
                }
                if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED)
                {
-                       if(event.GUIEvent.Caller->getID() != GUI_ID_BACK_BUTTON &&
-                               event.GUIEvent.Caller->getID() != GUI_ID_ABORT_BUTTON)
-                       {
-                               changeCtype("");
-                       }
-
                        switch (event.GUIEvent.Caller->getID())
                        {
-                       case GUI_ID_BACK_BUTTON: //back
-                               acceptInput();
-                               quitMenu();
-                               return true;
-                       case GUI_ID_ABORT_BUTTON: //abort
-                               quitMenu();
-                               return true;
-                       case GUI_ID_KEY_FORWARD_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->forward->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_BACKWARD_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->backward->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_LEFT_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->left->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_RIGHT_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->right->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_USE_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->use->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_FLY_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->fly->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_FAST_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->fast->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_JUMP_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->jump->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_DROP_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->dropbtn->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_CHAT_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->chat->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_CMD_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->cmd->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_CONSOLE_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->console->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_SNEAK_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->sneak->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_INVENTORY_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->inventory->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_DUMP_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->dump->setText(wgettext("press Key"));
-                               break;
-                       case GUI_ID_KEY_RANGE_BUTTON:
-                               resetMenu();
-                               activeKey = event.GUIEvent.Caller->getID();
-                               this->range->setText(wgettext("press Key"));
-                               break;
+                               case GUI_ID_BACK_BUTTON: //back
+                                       acceptInput();
+                                       quitMenu();
+                                       return true;
+                               case GUI_ID_ABORT_BUTTON: //abort
+                                       quitMenu();
+                                       return true;
+                               default:
+                                       key_setting *k = NULL;
+
+                                       for (key_setting *ks : key_settings) {
+                                               if (ks->id == event.GUIEvent.Caller->getID()) {
+                                                       k = ks;
+                                                       break;
+                                               }
+                                       }
+                                       FATAL_ERROR_IF(k == NULL, "Key setting not found");
+
+                                       resetMenu();
+                                       shift_down = false;
+                                       activeKey = event.GUIEvent.Caller->getID();
+                                       const wchar_t *text = wgettext("press key");
+                                       k->button->setText(text);
+                                       delete[] text;
+                                       this->key_used.erase(std::remove(this->key_used.begin(),
+                                                       this->key_used.end(), k->key), this->key_used.end());
+                                       break;
                        }
-                       //Buttons
-                       changeCtype("C");
-
+                       Environment->setFocus(this);
                }
        }
        return Parent ? Parent->OnEvent(event) : false;
 }
 
+void GUIKeyChangeMenu::add_key(int id, const wchar_t *button_name, const std::string &setting_name)
+{
+       key_setting *k = new key_setting;
+       k->id = id;
+
+       k->button_name = button_name;
+       k->setting_name = setting_name;
+       k->key = getKeySetting(k->setting_name.c_str());
+       key_settings.push_back(k);
+}
+
+void GUIKeyChangeMenu::init_keys()
+{
+       this->add_key(GUI_ID_KEY_FORWARD_BUTTON,   wgettext("Forward"),          "keymap_forward");
+       this->add_key(GUI_ID_KEY_BACKWARD_BUTTON,  wgettext("Backward"),         "keymap_backward");
+       this->add_key(GUI_ID_KEY_LEFT_BUTTON,      wgettext("Left"),             "keymap_left");
+       this->add_key(GUI_ID_KEY_RIGHT_BUTTON,     wgettext("Right"),            "keymap_right");
+       this->add_key(GUI_ID_KEY_USE_BUTTON,       wgettext("Special"),          "keymap_special1");
+       this->add_key(GUI_ID_KEY_JUMP_BUTTON,      wgettext("Jump"),             "keymap_jump");
+       this->add_key(GUI_ID_KEY_SNEAK_BUTTON,     wgettext("Sneak"),            "keymap_sneak");
+       this->add_key(GUI_ID_KEY_DROP_BUTTON,      wgettext("Drop"),             "keymap_drop");
+       this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"),        "keymap_inventory");
+       this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,wgettext("Prev. item"),      "keymap_hotbar_previous");
+       this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"),       "keymap_hotbar_next");
+       this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
+       this->add_key(GUI_ID_KEY_CAMERA_BUTTON,    wgettext("Change camera"),    "keymap_camera_mode");
+       this->add_key(GUI_ID_KEY_CINEMATIC_BUTTON, wgettext("Toggle Cinematic"), "keymap_cinematic");
+       this->add_key(GUI_ID_KEY_MINIMAP_BUTTON,   wgettext("Toggle minimap"),   "keymap_minimap");
+       this->add_key(GUI_ID_KEY_FLY_BUTTON,       wgettext("Toggle fly"),       "keymap_freemove");
+       this->add_key(GUI_ID_KEY_FAST_BUTTON,      wgettext("Toggle fast"),      "keymap_fastmove");
+       this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
+       this->add_key(GUI_ID_KEY_MUTE_BUTTON,      wgettext("Mute"),             "keymap_mute");
+       this->add_key(GUI_ID_KEY_DEC_VOLUME_BUTTON,wgettext("Dec. volume"),      "keymap_decrease_volume");
+       this->add_key(GUI_ID_KEY_INC_VOLUME_BUTTON,wgettext("Inc. volume"),      "keymap_increase_volume");
+       this->add_key(GUI_ID_KEY_AUTOFWD_BUTTON,   wgettext("Autoforward"),      "keymap_autoforward");
+       this->add_key(GUI_ID_KEY_CHAT_BUTTON,      wgettext("Chat"),             "keymap_chat");
+       this->add_key(GUI_ID_KEY_SCREENSHOT_BUTTON,wgettext("Screenshot"),       "keymap_screenshot");
+       this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
+       this->add_key(GUI_ID_KEY_DEC_RANGE_BUTTON, wgettext("Dec. range"),       "keymap_decrease_viewing_range_min");
+       this->add_key(GUI_ID_KEY_INC_RANGE_BUTTON, wgettext("Inc. range"),       "keymap_increase_viewing_range_min");
+       this->add_key(GUI_ID_KEY_CONSOLE_BUTTON,   wgettext("Console"),          "keymap_console");
+       this->add_key(GUI_ID_KEY_CMD_BUTTON,       wgettext("Command"),          "keymap_cmd");
+       this->add_key(GUI_ID_KEY_CMD_LOCAL_BUTTON, wgettext("Local command"),    "keymap_cmd_local");
+       this->add_key(GUI_ID_KEY_HUD_BUTTON,       wgettext("Toggle HUD"),       "keymap_toggle_hud");
+       this->add_key(GUI_ID_KEY_CHATLOG_BUTTON,   wgettext("Toggle chat log"),  "keymap_toggle_chat");
+       this->add_key(GUI_ID_KEY_FOG_BUTTON,       wgettext("Toggle fog"),       "keymap_toggle_force_fog_off");
+}
+