Fix sound direction and add experimental:soundblock alias sb in minimal for testing

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

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 01f583a0175dc8d79976079d5c62679b41aa8fd2..fb49ab65953d05e751a3fb342d848fe84487cba6 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -31,6 +31,28 @@
 #include <IGUIFont.h>
 #include "settings.h"
 
+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_CHAT_BUTTON,
+       GUI_ID_KEY_CMD_BUTTON,
+       GUI_ID_KEY_CONSOLE_BUTTON,
+       GUI_ID_KEY_SNEAK_BUTTON,
+       GUI_ID_KEY_DROP_BUTTON,
+       GUI_ID_KEY_INVENTORY_BUTTON,
+       GUI_ID_KEY_DUMP_BUTTON,
+       GUI_ID_KEY_RANGE_BUTTON
+};
+
 GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id, IMenuManager *menumgr) :
        GUIModalMenu(env, parent, id, menumgr)
@@ -83,10 +105,10 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        v2s32 topleft(0, 0);
        changeCtype("");
        {
-               core::rect < s32 > rect(0, 0, 125, 20);
+               core::rect < s32 > rect(0, 0, 500, 20);
                rect += topleft + v2s32(25, 3);
                //gui::IGUIStaticText *t =
-               Environment->addStaticText(wgettext("KEYBINDINGS"),
+               Environment->addStaticText(wgettext("KEYBINDINGS (If this menu screws up, see minetest.conf)"),
                                rect, false, true, this, -1);
                //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
        }
@@ -261,7 +283,20 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                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);
@@ -371,6 +406,7 @@ bool GUIKeyChangeMenu::acceptInput()
        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());
@@ -391,6 +427,7 @@ void GUIKeyChangeMenu::init_keys()
        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");
@@ -437,6 +474,9 @@ bool GUIKeyChangeMenu::resetMenu()
                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;
@@ -516,6 +556,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                        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()));
@@ -630,6 +675,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                                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();