ImGui input fixes

modifier keys, picked object leaks

Author: enginmanap

src/Editor/Editor.cpp

@@ -540,6 +540,22 @@ std::unique_ptr<ClosestNotMeConvexResultCallback> Editor::convexSweepTestDown(Mo
     return resultCallback;
 }
 
+void Editor::applyPendingPick() {
+    // hasPendingPick distinguishes "no pick happened this frame" from "user clicked empty space"
+    if (!hasPendingPick) {
+        return;
+    }
+    hasPendingPick = false;
+    if (pickedObject != nullptr) {
+        pickedObject->removeTag(HardCodedTags::PICKED_OBJECT);
+    }
+    pickedObject = pendingPickedObject;
+    pendingPickedObject = nullptr;
+    if (pickedObject != nullptr) {
+        pickedObject->addTag(HardCodedTags::PICKED_OBJECT);
+    }
+}
+
 void Editor::renderEditor(std::shared_ptr<GraphicsProgram> graphicsProgram) {
 
     imgGuiHelper->NewFrame(graphicsProgram);

src/ImGuiHelper.cpp

@@ -157,22 +157,23 @@ bool ImGuiHelper::ProcessEvent(InputHandler& inputHandler) {
         if(inputStates.getInputEvents(InputActions::TEXT_INPUT)) {
             io.AddInputCharactersUTF8(inputStates.getText());
         }
-        if(inputStates.getInputEvents(InputActions::KEY_SHIFT)) {
-            io.KeyShift = ((SDL_GetModState() & SDL_KMOD_SHIFT) != 0);
-        }
-        if(inputStates.getInputEvents(InputActions::KEY_SUPER)) {
-            io.KeySuper = ((SDL_GetModState() & SDL_KMOD_GUI) != 0);
-        }
-        if(inputStates.getInputEvents(InputActions::KEY_CTRL)) {
-            io.KeyCtrl = ((SDL_GetModState() & SDL_KMOD_CTRL) != 0);
-        }
-        if(inputStates.getInputEvents(InputActions::KEY_ALT)) {
-            io.KeyAlt = ((SDL_GetModState() & SDL_KMOD_ALT) != 0);
-        }
+        // ImGui 1.91.5+ removed the legacy io.KeyCtrl propagation path. io.KeyMods is now
+        // derived from ImGuiKey_ModCtrl etc. (ImGuiKey_ReservedForModCtrl), NOT from
+        // ImGuiKey_LeftCtrl, so we must deliver the virtual modifier keys explicitly.
+        SDL_Keymod sdlMods = SDL_GetModState();
+        io.AddKeyEvent(ImGuiMod_Ctrl,  (sdlMods & SDL_KMOD_CTRL)  != 0);
+        io.AddKeyEvent(ImGuiMod_Shift, (sdlMods & SDL_KMOD_SHIFT) != 0);
+        io.AddKeyEvent(ImGuiMod_Alt,   (sdlMods & SDL_KMOD_ALT)   != 0);
+        io.AddKeyEvent(ImGuiMod_Super, (sdlMods & SDL_KMOD_GUI)   != 0);
         int numKeys;
         const bool* sdlKeyStates = SDL_GetKeyboardState(&numKeys);
         for (int i = 0; i < numKeys; i++) {
-            ImGuiKey key = SDL2KeyEventToImGuiKey(SDL_SCANCODE_TO_KEYCODE(i));
+            // SDL3 keycodes for "legacy" keys (Backspace=0x08, Delete=0x7F, letters='a'-'z', etc.)
+            // are plain ASCII values — NOT scancode-masked. SDL_SCANCODE_TO_KEYCODE() always sets
+            // bit 30, so it produces wrong values for those keys. SDL_GetKeyFromScancode() returns
+            // the correct keycode in both cases.
+            SDL_Keycode sdlKeycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(i), SDL_KMOD_NONE, false);
+            ImGuiKey key = SDL2KeyEventToImGuiKey(static_cast<uint32_t>(sdlKeycode));
             if (key != ImGuiKey_None) {
                 io.AddKeyEvent(key, sdlKeyStates[i] != 0);
             }

src/World.cpp

@@ -570,15 +570,8 @@ World::fillRouteInformation(std::vector<LimonTypes::GenericParameter> parameters
     if(inputHandler.getInputStates().getInputEvents(InputActions::MOUSE_BUTTON_LEFT)) {
         if(inputHandler.getInputStates().getInputStatus(InputActions::MOUSE_BUTTON_LEFT)) {
             GameObject *gameObject = getPointedObject(COLLIDE_EVERYTHING, ~(COLLIDE_NOTHING));
-            if (gameObject != nullptr) {//FIXME this looks like a left over
-                if(editor->pickedObject != nullptr ) {
-                    editor->pickedObject->removeTag(HardCodedTags::PICKED_OBJECT);
-                }
-                editor->pickedObject = gameObject;
-                editor->pickedObject->addTag(HardCodedTags::PICKED_OBJECT);
-            } else {
-                editor->pickedObject = nullptr;
-            }
+            editor->pendingPickedObject = gameObject; // nullptr if nothing was hit
+            editor->hasPendingPick = true;
         }
     }
 
@@ -877,6 +870,7 @@ void World::ImGuiFrameSetup(std::shared_ptr<GraphicsProgram> graphicsProgram, co
        graphicsProgram->setUniform("renderModelIMGUI", 0);
    }
    editor->renderEditor(graphicsProgram);
+   editor->applyPendingPick();
 }
 
 void World::removeActiveCustomAnimation(const AnimationCustom &animationToRemove,