From 719c9c1cd2dc618692b44a9f2bb19ae0f9e76994 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 11 Dec 2013 22:42:56 +1300
Subject: [PATCH] Attempt to parse unexpected key events as text. Fixes #4232.

---
 OpenRA.FileFormats/Exts.cs            |  6 ------
 OpenRA.Renderer.SdlCommon/SdlInput.cs | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/OpenRA.FileFormats/Exts.cs b/OpenRA.FileFormats/Exts.cs
index f9cdf7bd6af1..8cc5ec979e89 100755
--- a/OpenRA.FileFormats/Exts.cs
+++ b/OpenRA.FileFormats/Exts.cs
@@ -82,12 +82,6 @@ public static bool HasModifier(this Modifiers k, Modifiers mod)
 			return (k & mod) == mod;
 		}
 
-		public static bool IsValidInput(this KeyInput key)
-		{
-			return char.IsLetter(key.UnicodeChar) || char.IsDigit(key.UnicodeChar) ||
-					char.IsSymbol(key.UnicodeChar) || char.IsSeparator(key.UnicodeChar) ||
-					char.IsPunctuation(key.UnicodeChar);
-		}
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
diff --git a/OpenRA.Renderer.SdlCommon/SdlInput.cs b/OpenRA.Renderer.SdlCommon/SdlInput.cs
index 6305e0fb7427..48d0a40312b9 100644
--- a/OpenRA.Renderer.SdlCommon/SdlInput.cs
+++ b/OpenRA.Renderer.SdlCommon/SdlInput.cs
@@ -151,8 +151,16 @@ public class SdlInput
 			{ Sdl.SDLK_UNDO, Keycode.UNDO },
 		};
 
+
 		MouseButton lastButtonBits = (MouseButton)0;
 
+		static bool IsValidInput(char c)
+		{
+			return char.IsLetter(c) || char.IsDigit(c) ||
+				char.IsSymbol(c) || char.IsSeparator(c) ||
+					char.IsPunctuation(c);
+		}
+
 		MouseButton MakeButton(byte b)
 		{
 			return b == Sdl.SDL_BUTTON_LEFT ? MouseButton.Left
@@ -242,7 +250,14 @@ public void PumpInput(IInputHandler inputHandler)
 						// Drop unknown keys
 						Keycode keyCode;
 						if (!KeyRemap.TryGetValue(e.key.keysym.sym, out keyCode))
+						{
+							// Try parsing it as text
+							var c = (char)e.key.keysym.unicode;
+							if (IsValidInput(c))
+								inputHandler.OnTextInput(c.ToString());
+
 							break;
+						}
 
 						var type = e.type == Sdl.SDL_KEYDOWN ?
 							KeyInputEvent.Down : KeyInputEvent.Up;
@@ -269,7 +284,7 @@ public void PumpInput(IInputHandler inputHandler)
 						else
 							inputHandler.OnKeyInput(keyEvent);
 
-						if (keyEvent.IsValidInput())
+						if (IsValidInput(keyEvent.UnicodeChar))
 							inputHandler.OnTextInput(keyEvent.UnicodeChar.ToString());
 
 						break;