Ticket #3870: keyfixv3.patch

source/gui/CGUI.cpp

@@ -65 +65 @@
 {
     InReaction ret = IN_PASS;
 
-    if (ev->ev.type == SDL_HOTKEYDOWN)
+    // Handle keys for input boxes
+    if ( GetFocusedObject() && 
+        ((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_KEYUP && (ev->ev.key.keysym.sym == SDLK_KP_ENTER || ev->ev.key.keysym.sym == SDLK_RETURN)) ||
+            ev->ev.type == SDL_TEXTINPUT ||
+            ev->ev.type == SDL_TEXTEDITING) )
     {
+        ret = GetFocusedObject()->ManuallyHandleEvent(ev);
+    }
+
+    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 +257 @@
         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.
-    }
-
+    // else will return IN_PASS because we never used the button.
     return ret;
 }
 

source/gui/CInput.cpp

@@ -95 +95 @@
 {
     ENSURE(m_iBufferPos != -1);
 
-    if (ev->ev.type == SDL_HOTKEYDOWN)
+    if (ev->ev.type == SDL_HOTKEYUP)
     {
         if (m_ComposingText)
             return IN_HANDLED;
@@ -181 +181 @@
 
         return IN_HANDLED;
     }
+    else if (ev->ev.type == SDL_KEYUP)
+    {
+        if (ev->ev.key.keysym.sym == SDLK_KP_ENTER || ev->ev.key.keysym.sym == SDLK_RETURN)
+            // 'Return' should do a Press event for single liners (e.g. submitting forms)
+            //  otherwise a '\n' character will be added.
+        {
+            bool multiline;
+            GUI<bool>::GetSetting(this, "multiline", multiline);
+            if (!multiline)
+            {
+                SendEvent(GUIM_PRESSED, "press");
+                UpdateBufferPositionSetting();
+                return IN_HANDLED;
+            }
+            
+        }
+    }
     else if (ev->ev.type == SDL_KEYDOWN)
     {
         if (m_ComposingText)
@@ -474 +491 @@
         {
             bool multiline;
             GUI<bool>::GetSetting(this, "multiline", multiline);
-            if (!multiline)
+            if (multiline)
             {
-                SendEvent(GUIM_PRESSED, "press");
-                break;
+                cooked = '\n'; // Change to '\n' and do default:
             }
-
-            cooked = '\n'; // Change to '\n' and do default:
             // NOTE: Fall-through
         }
         default: // Insert a character