X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a7419ea4b837b23a36ea0eb71b0c24a31a49d3fc..b9d7bcadee831e9b59fb785f2464a5fc1897bd1a:/unicode.c

diff --git a/unicode.c b/unicode.c
index 90faf590..19a2e1d2 100644
--- a/unicode.c
+++ b/unicode.c
@@ -1,4 +1,6 @@
+#ifdef WINDOWS
 #include <windows.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -6,6 +8,7 @@
 
 #include <time.h>
 #include "putty.h"
+#include "terminal.h"
 #include "misc.h"
 
 /* Character conversion arrays; they are usually taken from windows,
@@ -595,14 +598,14 @@ static void link_font(WCHAR * line_tbl, WCHAR * font_tbl, WCHAR attr)
     }
 }
 
-void lpage_send(int codepage, char *buf, int len, int interactive)
+void lpage_send(void *ldisc, int codepage, char *buf, int len, int interactive)
 {
     static wchar_t *widebuffer = 0;
     static int widesize = 0;
     int wclen;
 
     if (codepage < 0) {
-	ldisc_send(buf, len, interactive);
+	ldisc_send(ldisc, buf, len, interactive);
 	return;
     }
 
@@ -612,16 +615,15 @@ void lpage_send(int codepage, char *buf, int len, int interactive)
 	widesize = len * 2;
     }
 
-    wclen =
-	MultiByteToWideChar(codepage, 0, buf, len, widebuffer, widesize);
-    luni_send(widebuffer, wclen, interactive);
+    wclen = mb_to_wc(codepage, 0, buf, len, widebuffer, widesize);
+    luni_send(ldisc, widebuffer, wclen, interactive);
 }
 
-void luni_send(wchar_t * widebuf, int len, int interactive)
+void luni_send(void *ldisc, wchar_t * widebuf, int len, int interactive)
 {
     static char *linebuffer = 0;
     static int linesize = 0;
-    int ratio = (in_utf)?3:1;
+    int ratio = (in_utf(term))?3:1;
     int i;
     char *p;
 
@@ -631,7 +633,7 @@ void luni_send(wchar_t * widebuf, int len, int interactive)
 	linesize = len * ratio * 2;
     }
 
-    if (in_utf) {
+    if (in_utf(term)) {
 	/* UTF is a simple algorithm */
 	for (p = linebuffer, i = 0; i < len; i++) {
 	    wchar_t ch = widebuf[i];
@@ -651,8 +653,8 @@ void luni_send(wchar_t * widebuf, int len, int interactive)
 	}
     } else if (!uni_tbl) {
 	int rv;
-	rv = WideCharToMultiByte(line_codepage, 0, widebuf, len,
-				 linebuffer, linesize, NULL, NULL);
+	rv = wc_to_mb(line_codepage, 0, widebuf, len,
+		      linebuffer, linesize, NULL, NULL);
 	if (rv >= 0)
 	    p = linebuffer + rv;
 	else
@@ -675,7 +677,7 @@ void luni_send(wchar_t * widebuf, int len, int interactive)
 	}
     }
     if (p > linebuffer)
-	ldisc_send(linebuffer, p - linebuffer, interactive);
+	ldisc_send(ldisc, linebuffer, p - linebuffer, interactive);
 }
 
 wchar_t xlat_uskbd2cyrllic(int ch)
@@ -1241,7 +1243,7 @@ void get_unitab(int codepage, wchar_t * unitab, int ftype)
 	for (i = 0; i < max; i++) {
 	    tbuf[0] = i;
 
-	    if (MultiByteToWideChar(codepage, flg, tbuf, 1, unitab + i, 1)
+	    if (mb_to_wc(codepage, flg, tbuf, 1, unitab + i, 1)
 		!= 1)
 		unitab[i] = 0xFFFD;
 	}