X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1709795fee167cc2d2d423df0161e7963376b910..a86a2725f697fec44ea1527b8c11ff43798c9dfe:/unix/uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index fbd4e967..fb0b36ab 100644
--- a/unix/uxucs.c
+++ b/unix/uxucs.c
@@ -4,6 +4,7 @@
 
 #include <time.h>
 #include "putty.h"
+#include "terminal.h"
 #include "misc.h"
 
 /*
@@ -13,74 +14,6 @@
  * are ISO8859-1.
  */
 
-void lpage_send(int codepage, char *buf, int len, int interactive)
-{
-    ldisc_send(buf, len, interactive);
-}
-
-void luni_send(wchar_t * widebuf, int len, int interactive)
-{
-    static char *linebuffer = 0;
-    static int linesize = 0;
-    int ratio = (in_utf)?6:1;
-    int i;
-    char *p;
-
-    if (len * ratio > linesize) {
-	sfree(linebuffer);
-	linebuffer = smalloc(len * ratio * 2 * sizeof(wchar_t));
-	linesize = len * ratio * 2;
-    }
-
-    if (in_utf) {
-	/* UTF is a simple algorithm */
-	for (p = linebuffer, i = 0; i < len; i++) {
-	    wchar_t ch = widebuf[i];
-
-	    if ((ch&0xF800) == 0xD800) ch = '.';
-
-	    if (ch < 0x80) {
-		*p++ = (char) (ch);
-	    } else if (ch < 0x800) {
-		*p++ = (0xC0 | (ch >> 6));
-		*p++ = (0x80 | (ch & 0x3F));
-	    } else if (ch < 0x10000) {
-		*p++ = (0xE0 | (ch >> 12));
-		*p++ = (0x80 | ((ch >> 6) & 0x3F));
-		*p++ = (0x80 | (ch & 0x3F));
-	    } else if (ch < 0x200000) {
-		*p++ = (0xF0 | (ch >> 18));
-		*p++ = (0x80 | ((ch >> 12) & 0x3F));
-		*p++ = (0x80 | ((ch >> 6) & 0x3F));
-		*p++ = (0x80 | (ch & 0x3F));
-	    } else if (ch < 0x4000000) {
-		*p++ = (0xF8 | (ch >> 24));
-		*p++ = (0x80 | ((ch >> 18) & 0x3F));
-		*p++ = (0x80 | ((ch >> 12) & 0x3F));
-		*p++ = (0x80 | ((ch >> 6) & 0x3F));
-		*p++ = (0x80 | (ch & 0x3F));
-	    } else {
-		*p++ = (0xFC | (ch >> 30));
-		*p++ = (0x80 | ((ch >> 24) & 0x3F));
-		*p++ = (0x80 | ((ch >> 18) & 0x3F));
-		*p++ = (0x80 | ((ch >> 12) & 0x3F));
-		*p++ = (0x80 | ((ch >> 6) & 0x3F));
-		*p++ = (0x80 | (ch & 0x3F));
-	    }
-	}
-    } else {
-	for (p = linebuffer, i = 0; i < len; i++) {
-	    wchar_t ch = widebuf[i];
-	    if (ch < 0x100)
-		*p++ = (char) ch;
-	    else
-		*p++ = '.';
-	}
-    }
-    if (p > linebuffer)
-	ldisc_send(linebuffer, p - linebuffer, interactive);
-}
-
 int is_dbcs_leadbyte(int codepage, char byte)
 {
     return 0;			       /* we don't do DBCS */
@@ -92,7 +25,29 @@ int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
     int ret = 0;
     while (mblen > 0 && wclen > 0) {
 	*wcstr++ = (unsigned char) *mbstr++;
-	ret++;
+	mblen--, wclen--, ret++;
+    }
+    return ret;			       /* FIXME: check error codes! */
+}
+
+int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
+	     char *mbstr, int mblen, char *defchr, int *defused)
+{
+    int ret = 0;
+    if (defused)
+	*defused = 0;
+    while (mblen > 0 && wclen > 0) {
+	if (*wcstr >= 0x100) {
+	    if (defchr)
+		*mbstr++ = *defchr;
+	    else
+		*mbstr++ = '.';
+	    if (defused)
+		*defused = 1;
+	} else
+	    *mbstr++ = (unsigned char) *wcstr;
+	wcstr++;
+	mblen--, wclen--, ret++;
     }
     return ret;			       /* FIXME: check error codes! */
 }
@@ -109,6 +64,6 @@ void init_ucs(void)
 
     for (i = 0; i < 256; i++) {
 	unitab_line[i] = unitab_scoacs[i] = i;
-	unitab_xterm[i] = i & 0x1F;
+	unitab_xterm[i] = (i >= 0x5F && i < 0x7F) ? ((i+1) & 0x1F) : i;
     }
-}
\ No newline at end of file
+}