Ticket #3870: keyfix.patch

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -83 +83 @@
             {"nick": "h20", "name": "Daniel Wilhelm"},
             {"nick": "historic_bruno", "name": "Ben Brian"},
             {"nick": "idanwin"},
+            {"nick": "Imarok", "name": "J. S."},
             {"nick": "infyquest", "name": "Vijay Kiran Kamuju"},
             {"nick": "IronNerd", "name": "Matthew McMullan"},
             {"nick": "Itms", "name": "Nicolas Auvray"},

source/gui/CGUI.cpp

@@ -65 +65 @@
 {
     InReaction ret = IN_PASS;
 
-    if (ev->ev.type == SDL_HOTKEYDOWN)
+    // Handle keys for input boxes
+    if (GetFocusedObject())
     {
+        if (
+            (ev->ev.type == SDL_KEYDOWN &&
+            ev->ev.key.keysym.sym != SDLK_ESCAPE &&
+            !g_keys[SDLK_LCTRL] && !g_keys[SDLK_RCTRL] &&
+            !g_keys[SDLK_LALT] && !g_keys[SDLK_RALT])
+            || ev->ev.type == SDL_HOTKEYDOWN
+            || ev->ev.type == SDL_TEXTINPUT || ev->ev.type == SDL_TEXTEDITING
+            )
+        {
+            ret = GetFocusedObject()->ManuallyHandleEvent(ev);
+        }
+        // else will return IN_PASS because we never used the button.
+    }
+
+    else if (ev->ev.type == SDL_HOTKEYUP)
+    {
         const char* hotkey = static_cast<const char*>(ev->ev.user.data1);
         std::map<CStr, std::vector<IGUIObject*> >::iterator it = m_HotkeyObjects.find(hotkey);
         if (it != m_HotkeyObjects.end())
@@ -243 +260 @@
         m_MousePos = oldMousePos;
     }
 
-    // Handle keys for input boxes
-    if (GetFocusedObject())
-    {
-        if (
-            (ev->ev.type == SDL_KEYDOWN &&
-                ev->ev.key.keysym.sym != SDLK_ESCAPE &&
-                !g_keys[SDLK_LCTRL] && !g_keys[SDLK_RCTRL] &&
-                !g_keys[SDLK_LALT] && !g_keys[SDLK_RALT])
-            || ev->ev.type == SDL_HOTKEYDOWN
-            || ev->ev.type == SDL_TEXTINPUT || ev->ev.type == SDL_TEXTEDITING
-            )
-        {
-            ret = GetFocusedObject()->ManuallyHandleEvent(ev);
-        }
-        // else will return IN_PASS because we never used the button.
-    }
+    
 
     return ret;
 }