Line discipline module now uses dynamically allocated data. Also

[u/mdw/putty] / unix / uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index fbd4e96..ff8f3a1 100644 (file)
--- 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,16 +14,16 @@
  * are ISO8859-1.
  */
 
-void lpage_send(int codepage, char *buf, int len, int interactive)
+void lpage_send(void *ldisc, int codepage, char *buf, int len, int interactive)
 {
-    ldisc_send(buf, len, interactive);
+    ldisc_send(ldisc, buf, len, 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)?6:1;
+    int ratio = (in_utf(term))?6:1;
     int i;
     char *p;
 
@@ -32,7 +33,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];
@@ -78,7 +79,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);
 }
 
 int is_dbcs_leadbyte(int codepage, char byte)
@@ -92,7 +93,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++ = '\xBF';
+           if (defused)
+               *defused = 1;
+       } else
+           *mbstr++ = (unsigned char) *wcstr;
+       wcstr++;
+       mblen--, wclen--, ret++;
     }
     return ret;                               /* FIXME: check error codes! */
 }
@@ -109,6 +132,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
+}