X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ldiscucs.c;h=1634bc43fd603520927dce87b558f720ef8cbf92;hb=19376bd33fcb79b31b0fda0e9c7e1f90d628b242;hp=2e19adccc8c5c533040f0542c62fdcef435fae19;hpb=a4ca42238f8119336f28cfeb020b03bb9370a9f3;p=PuTTY.git

diff --git a/ldiscucs.c b/ldiscucs.c
index 2e19adcc..1634bc43 100644
--- a/ldiscucs.c
+++ b/ldiscucs.c
@@ -13,7 +13,7 @@
 #include "ldisc.h"
 
 void lpage_send(void *handle,
-		int codepage, char *buf, int len, int interactive)
+		int codepage, const char *buf, int len, int interactive)
 {
     Ldisc ldisc = (Ldisc)handle;
     wchar_t *widebuffer = 0;
@@ -26,7 +26,7 @@ void lpage_send(void *handle,
     }
 
     widesize = len * 2;
-    widebuffer = smalloc(widesize * sizeof(wchar_t));
+    widebuffer = snewn(widesize, wchar_t);
 
     wclen = mb_to_wc(codepage, 0, buf, len, widebuffer, widesize);
     luni_send(ldisc, widebuffer, wclen, interactive);
@@ -34,7 +34,7 @@ void lpage_send(void *handle,
     sfree(widebuffer);
 }
 
-void luni_send(void *handle, wchar_t * widebuf, int len, int interactive)
+void luni_send(void *handle, const wchar_t *widebuf, int len, int interactive)
 {
     Ldisc ldisc = (Ldisc)handle;
     int ratio = (in_utf(ldisc->term))?3:1;
@@ -44,30 +44,49 @@ void luni_send(void *handle, wchar_t * widebuf, int len, int interactive)
     char *p;
 
     linesize = len * ratio * 2;
-    linebuffer = smalloc(linesize * sizeof(wchar_t));
+    linebuffer = snewn(linesize, char);
 
     if (in_utf(ldisc->term)) {
 	/* UTF is a simple algorithm */
 	for (p = linebuffer, i = 0; i < len; i++) {
-	    wchar_t ch = widebuf[i];
-	    /* We only deal with 16-bit wide chars */
-	    if ((ch&0xF800) == 0xD800) ch = '.';
+	    unsigned long ch = widebuf[i];
+
+	    if (IS_SURROGATE(ch)) {
+#ifdef PLATFORM_IS_UTF16
+		if (i+1 < len) {
+		    unsigned long ch2 = widebuf[i+1];
+		    if (IS_SURROGATE_PAIR(ch, ch2)) {
+			ch = FROM_SURROGATES(ch, ch2);
+			i++;
+		    }
+		} else
+#endif
+		{
+		    /* Unrecognised UTF-16 sequence */
+		    ch = '.';
+		}
+	    }
 
 	    if (ch < 0x80) {
 		*p++ = (char) (ch);
 	    } else if (ch < 0x800) {
-		*p++ = (0xC0 | (ch >> 6));
-		*p++ = (0x80 | (ch & 0x3F));
+		*p++ = (char) (0xC0 | (ch >> 6));
+		*p++ = (char) (0x80 | (ch & 0x3F));
+	    } else if (ch < 0x10000) {
+		*p++ = (char) (0xE0 | (ch >> 12));
+		*p++ = (char) (0x80 | ((ch >> 6) & 0x3F));
+		*p++ = (char) (0x80 | (ch & 0x3F));
 	    } else {
-		*p++ = (0xE0 | (ch >> 12));
-		*p++ = (0x80 | ((ch >> 6) & 0x3F));
-		*p++ = (0x80 | (ch & 0x3F));
+		*p++ = (char) (0xF0 | (ch >> 18));
+		*p++ = (char) (0x80 | ((ch >> 12) & 0x3F));
+		*p++ = (char) (0x80 | ((ch >> 6) & 0x3F));
+		*p++ = (char) (0x80 | (ch & 0x3F));
 	    }
 	}
     } else {
 	int rv;
-	rv = wc_to_mb(line_codepage, 0, widebuf, len,
-		      linebuffer, linesize, NULL, NULL);
+	rv = wc_to_mb(ldisc->term->ucsdata->line_codepage, 0, widebuf, len,
+		      linebuffer, linesize, NULL, NULL, ldisc->term->ucsdata);
 	if (rv >= 0)
 	    p = linebuffer + rv;
 	else