first pass

[PuTTY.git] / ldiscucs.c

diff --git a/ldiscucs.c b/ldiscucs.c
index c4fc726d529efa38c93fb61302e52015851d5c2b..1634bc43fd603520927dce87b558f720ef8cbf92 100644 (file)
--- 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;
@@ -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;
@@ -51,13 +51,12 @@ void luni_send(void *handle, wchar_t * widebuf, int len, int interactive)
        for (p = linebuffer, i = 0; i < len; i++) {
            unsigned long ch = widebuf[i];
 
-           if ((ch & 0xF800) == 0xD800) {
+           if (IS_SURROGATE(ch)) {
 #ifdef PLATFORM_IS_UTF16
                if (i+1 < len) {
                    unsigned long ch2 = widebuf[i+1];
-                   if ((ch & 0xFC00) == 0xD800 &&
-                       (ch2 & 0xFC00) == 0xDC00) {
-                       ch = 0x10000 + ((ch & 0x3FF) << 10) + (ch2 & 0x3FF);
+                   if (IS_SURROGATE_PAIR(ch, ch2)) {
+                       ch = FROM_SURROGATES(ch, ch2);
                        i++;
                    }
                } else