redefinir tecles

source/core/system/director.cpp

@@ -5,6 +5,7 @@
 
 #include "core/input/gamepad.hpp"
 #include "core/input/global_inputs.hpp"
+#include "core/input/key_remap.hpp"
 #include "core/input/mouse.hpp"
 #include "core/jail/jgame.hpp"
 #include "core/jail/jinput.hpp"
@@ -54,6 +55,7 @@ void Director::run() {
 
         handleEvents();
         Gamepad::update();
+        KeyRemap::update();
         GlobalInputs::handle();
         Mouse::updateCursorVisibility();
 
@@ -117,11 +119,24 @@ void Director::handleEvents() {
             Gamepad::handleEvent(event);
             continue;
         }
+        // Empassar-se el KEY_UP de qualsevol tecla que el menú va consumir en KEY_DOWN
+        if (event.type == SDL_EVENT_KEY_UP && event.key.scancode >= 0 &&
+            event.key.scancode < SDL_SCANCODE_COUNT && menu_keys_held_[event.key.scancode]) {
+            menu_keys_held_[event.key.scancode] = false;
+            continue;
+        }
+        // Captura de tecla (remapeig al menú): intercepta KEY_DOWN abans de tot
+        if (Menu::isCapturing() && event.type == SDL_EVENT_KEY_DOWN && !event.key.repeat) {
+            Menu::captureKey(event.key.scancode);
+            menu_keys_held_[event.key.scancode] = true;
+            continue;
+        }
         // Menú: F12 (o tecla configurada) obre/tanca el menú flotant
         if (event.type == SDL_EVENT_KEY_DOWN && !event.key.repeat &&
             event.key.scancode == Options::keys_gui.menu_toggle) {
             Menu::toggle();
             JI_SetInputBlocked(Menu::isOpen());
+            menu_keys_held_[event.key.scancode] = true;
             continue;
         }
         // Si el menú està obert, consumeix tot l'input de teclat
@@ -133,7 +148,12 @@ void Director::handleEvents() {
                 esc_swallow_until_release_ = true;
             } else {
                 Menu::handleKey(event.key.scancode);
+                // El menú pot haver-se tancat (p.ex. Backspace al nivell arrel)
+                if (!Menu::isOpen()) {
+                    JI_SetInputBlocked(false);
+                }
             }
+            menu_keys_held_[event.key.scancode] = true;
             continue;
         }
         if (Menu::isOpen() && event.type == SDL_EVENT_KEY_UP) {