improve text input

diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas
index 81b1ca3dc6ade228ac39c49b5d7cbc1e41409252..25e95eca8841d5a987f5e87bb218bc0cb4f26fb9 100644 (file)
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -263,11 +263,8 @@ implementation
     begin
       KeyPress(key)
     end;
-    if down and (ev.keysym.unicode <= $44F) then
-    begin
-      if IsPrintable1251(ch) then
-        CharPress(ch)
-    end
+    if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
+      CharPress(ch)
   end;
 
   function sys_HandleInput (): Boolean;

diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 4c4db7b0df59997698bca6e3d5861cb9ba9a01a0..20706c661dae397f8a0b4914ab00e9caa765a252 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
@@ -87,6 +87,7 @@ function int64ToStrComma (i: Int64): AnsiString;
 
 function upcase1251 (ch: AnsiChar): AnsiChar; inline;
 function locase1251 (ch: AnsiChar): AnsiChar; inline;
+function IsValid1251 (ch: Word): Boolean;
 function IsPrintable1251 (ch: AnsiChar): Boolean;
 
 function toLowerCase1251 (const s: AnsiString): AnsiString;
@@ -962,6 +963,11 @@ begin
   result := ch;
 end;
 
+function IsValid1251 (ch: Word): Boolean;
+begin
+  result := (ch = Ord('?')) or (wc2shitmap[ch] <> '?')
+end;
+
 function IsPrintable1251 (ch: AnsiChar): Boolean;
 begin
   result := (ch >= #32) and (ch <> #127)