X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=67387dba6b6d8bf2cabfc2e1382ceeb00628e2fb;hb=abdc9afc1453ccca8e3c7cb6ec0ca455cf79d230;hp=1a25886799791e976727ca56a7a36e381f97ef7f;hpb=4a0a2f1f4922d5346c4aee584e7d4a13803bffab;p=flatwaifu.git

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 1a25886..67387db 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -11,6 +11,8 @@
 #include "system.h"
 #include "input.h"
 
+#include "cp866.h"
+
 #include "my.h" // fexists
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
@@ -452,37 +454,6 @@ static int utf8_to_wchar (char *x) {
   return i;
 }
 
-static int wchar_to_cp866 (int uch) {
-  if (uch <= 0x7f) {
-    return uch;
-  } else if (uch >= 0x410 && uch <= 0x43f) {
-    return uch - 0x410 + 0x80;
-  } else if (uch >= 0x440 && uch <= 0x44f) {
-    return uch - 0x440 + 0xe0;
-  } else {
-    switch (uch) {
-      // TODO graphics from 0xb0..0xdf
-      case 0x401: return 0xf0;
-      case 0x451: return 0xf1;
-      case 0x404: return 0xf2;
-      case 0x454: return 0xf3;
-      case 0x407: return 0xf4;
-      case 0x457: return 0xf5;
-      case 0x40e: return 0xf6;
-      case 0x45e: return 0xf7;
-      case 0xb0: return 0xf8;
-      case 0x2219: return 0xf9;
-      case 0xb7: return 0xfa;
-      case 0x221a: return 0xfb;
-      case 0x2116: return 0xfc;
-      case 0xa4: return 0xfd;
-      case 0x25a0: return 0xfe;
-      case 0xa0: return 0xff;
-      default: return 0; // unknown
-    }
-  }
-}
-
 static void poll_events (void) {
   int key, down, uch, ch;
   SDL_Event ev;
@@ -505,8 +476,10 @@ static void poll_events (void) {
         break;
       case SDL_TEXTINPUT:
         uch = utf8_to_wchar(ev.text.text);
-        ch = wchar_to_cp866(uch);
-        GM_input(ch);
+        ch = cp866_utoc(uch);
+        if (ch >= 0) {
+          GM_input(ch);
+        }
         break;
     }
   }