Miscellaneous fixes to try to make other compilers happier

[u/mdw/putty] / xlat.c

diff --git a/xlat.c b/xlat.c
index b627f3a..95fa343 100644 (file)
--- a/xlat.c
+++ b/xlat.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 
@@ -42,10 +49,52 @@ static unsigned char koi2win[] =
     207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218
 };
 
+static unsigned char xlatWIN1250toISO88592[] =
+{
+      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+     32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+     48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+     64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+     80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+     96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+    112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+    128,129, 39,131, 34, 46,124,124,136, 47,169, 60,166,171,174,172,
+    144, 96, 39, 34, 34, 42, 45, 45,152, 84,185, 62,182,187,190,188,
+    160,183,162,163,164,161,124,167,168, 99,170, 34, 39,173, 82,175,
+    176, 63,178,179,180,117,182,255,184,177,186, 34,165,189,181,191,
+    192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+    208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+    224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+    240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static unsigned char xlatISO88592toWIN1250[] =
+{
+      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+     32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+     48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+     64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+     80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+     96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+    112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+    128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+    144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+    160,165,162,163,164,188,140,167,168,138,170,141,143,173,142,175,
+    176,185,178,179,180,190,156,161,184,154,186,157,159,189,158,191,
+    192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+    208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+    224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+    240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
 unsigned char xlat_kbd2tty(unsigned char c)
 {
     if(cfg.xlat_enablekoiwin)
        return win2koi[c];
+    else if (cfg.xlat_88592w1250)
+        return xlatWIN1250toISO88592[c];
     return c;
 }
 
@@ -53,6 +102,8 @@ unsigned char xlat_tty2scr(unsigned char c)
 {
     if(cfg.xlat_enablekoiwin)
        return koi2win[c];
+    else if (cfg.xlat_88592w1250)
+        return xlatISO88592toWIN1250[c];
     return c;
 }