*** empty log message ***

1 files changed, 43 insertions, 3 deletions

diff --git a/src/utf8.c b/src/utf8.c
index 52ba398..ff8a2ec 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.5  2008/02/24 00:42:53  james
+ * *** empty log message ***
+ *
  * Revision 1.4  2008/02/23 13:05:58  staffcvs
  * *** empty log message ***
  *
@@ -61,7 +64,7 @@ utf8_flush (Context * c)
 }
 
 void
-utf8_parse (Context * c, int ch)
+utf8_parse (Context * c, uint32_t ch)
 {
   UTF8 *u = c->u;
 
@@ -74,7 +77,8 @@ utf8_parse (Context * c, int ch)
 
   if (!u->in_utf8)
     {
-      /*FIXME: for the moment we bodge utf8 support */
+      /*FIXME: for the moment we bodge utf8 support - need to do */
+      /* L->R and R->L and double width characters */
       if (ch == 0xb9)
         {                       /*CSI, not a valid utf8 start char */
           vt102_parse_char (c, ch);
@@ -123,7 +127,7 @@ utf8_parse (Context * c, int ch)
           u->in_utf8--;
 
           if (!u->in_utf8)
-            vt102_parse_char (c, ch);
+            vt102_parse_char (c, u->ch);
         }
     }
 }
@@ -140,3 +144,39 @@ utf8_new (void)
   ret->in_utf8 = 0;
 
 }
+
+
+
+void
+utf8_emit (TTY * t, int ch)
+{
+  uint8_t buf[4];
+
+  if (ch < 0x80)
+    {
+      buf[0] = ch;
+      t->xmit (t, buf, 1);
+    }
+  else if (ch < 0x800)
+    {
+      buf[0] = 0xc0 | (ch >> 6);
+      buf[1] = 0x80 | (ch & 0x3f);
+
+      t->xmit (t, buf, 2);
+    }
+  else if (ch < 0x10000)
+    {
+      buf[0] = 0xe0 | (ch >> 12);
+      buf[1] = 0x80 | ((ch >> 6) & 0x3f);
+      buf[2] = 0x80 | (ch & 0x3f);
+      t->xmit (t, buf, 3);
+    }
+  else if (ch < 0x1fffff)
+    {
+      buf[0] = 0xf0 | (ch >> 18);
+      buf[1] = 0x80 | ((ch >> 12) & 0x3f);
+      buf[2] = 0x80 | ((ch >> 6) & 0x3f);
+      buf[3] = 0x80 | (ch & 0x3f);
+      t->xmit (t, buf, 4);
+    }
+}