Changeset 982Tweet

Timestamp:

May 25, 2006, 10:01:10 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Have cucul_utf8_to_utf32 write how many bytes it read.
• Use that in the SLang driver so that it supports UTF-8 input.

Location:

libcaca/trunk

Files:

• caca/driver_slang.c (modified) (4 diffs)
• cucul/box.c (modified) (1 diff)
• cucul/canvas.c (modified) (1 diff)
• cucul/charset.c (modified) (2 diffs)
• cucul/conic.c (modified) (2 diffs)
• cucul/cucul.h (modified) (1 diff)
• cucul/line.c (modified) (2 diffs)
• cucul/triangle.c (modified) (1 diff)

libcaca/trunk/caca/driver_slang.c

@@ -212 +212 @@
 
 #if defined(OPTIMISE_SLANG_PALETTE)
+            /* If foreground == background, just don't use this colour
+             * pair, and print a space instead of the real character.
+             * XXX: disabled, because I can't remember what it was
+             * here for, and in cases where SLang does not render
+             * bright backgrounds, it's just fucked up. */
+#if 0
             uint8_t fgcolor = _cucul_argb32_to_ansi4fg(*attr);
             uint8_t bgcolor = _cucul_argb32_to_ansi4bg(*attr);
 
-            /* If foreground == background, just don't use this colour
-             * pair, and print a space instead of the real character. */
-            if(fgcolor != bgcolor)
-            {
-                SLsmg_set_color(slang_assoc[_cucul_argb32_to_ansi8(*attr++)]);
-                slang_write_utf32(ch);
-            }
-            else
+            if(fgcolor == bgcolor)
             {
                 if(fgcolor == CUCUL_COLOR_BLACK)
@@ -235 +234 @@
                 attr++;
             }
+            else
+#endif
+            {
+                SLsmg_set_color(slang_assoc[_cucul_argb32_to_ansi8(*attr++)]);
+                slang_write_utf32(ch);
+            }
 #else
             SLsmg_set_color(_cucul_argb32_to_ansi8(*attr++));
@@ -284 +289 @@
         ev->data.key.utf8[1] = '\0';
         return 1;
+    }
+
+    /* If the key was UTF-8, parse the whole sequence */
+    if(intkey >= 0x80 && intkey < 0x100)
+    {
+        int keys[7]; /* Necessary for ungetkey(); */
+        char utf8[7];
+        uint32_t utf32;
+        unsigned int i, bytes = 0;
+
+        keys[0] = intkey;
+        utf8[0] = intkey;
+
+        for(i = 1; i < 6; i++)
+        {
+            if(!SLang_input_pending(0))
+                break;
+            keys[i] = SLang_getkey();
+            utf8[i] = (unsigned char)keys[i];
+        }
+
+        utf8[i] = '\0';
+        utf32 = cucul_utf8_to_utf32(utf8, &bytes);
+
+        while(i > bytes)
+            SLang_ungetkey(keys[--i]);
+
+        if(bytes)
+        {
+            ev->type = CACA_EVENT_KEY_PRESS;
+            ev->data.key.ch = 0;
+            ev->data.key.utf32 = utf32;
+            strcpy(ev->data.key.utf8, utf8);
+            return 1;
+        }
     }
 
@@ -339 +379 @@
         case SL_KEY_F(12): ev->data.key.ch = CACA_KEY_F12; break;
 
-        default: ev->type = CACA_EVENT_NONE; return 0;
+        default:
+            /* Unknown key */
+            ev->type = CACA_EVENT_NONE; return 0;
     }
 

libcaca/trunk/cucul/box.c

@@ -156 +156 @@
     if(y2 > ymax) y2 = ymax;
 
-    ch = cucul_utf8_to_utf32(str);
+    ch = cucul_utf8_to_utf32(str, NULL);
 
     for(y = y1; y <= y2; y++)

libcaca/trunk/cucul/canvas.c

@@ -117 +117 @@
     while(len)
     {
-        *chars++ = cucul_utf8_to_utf32(s);
+        *chars++ = cucul_utf8_to_utf32(s, NULL);
         *attr++ = (cv->bgcolor << 16) | cv->fgcolor;
 

libcaca/trunk/cucul/charset.c

@@ -96 +96 @@
  *
  *  This function converts a UTF-8 character read from a string and returns
- *  its value in the UTF-32 character set.
+ *  its value in the UTF-32 character set. If the second argument is not null,
+ *  the total number of read bytes is written in it.
+ *
+ *  If a null byte was reached before the expected end of the UTF-8 sequence,
+ *  this function returns zero and the number of read bytes is set to zero.
  *
  *  This function never fails, but its behaviour with illegal UTF-8 sequences
@@ -102 +106 @@
  *
  *  \param s A string containing the UTF-8 character.
- *  \return The corresponding UTF-32 character.
- */
-unsigned long int cucul_utf8_to_utf32(char const *s)
-{
-    int bytes = trailing[(int)(unsigned char)*s];
+ *  \param read A pointer to an unsigned integer to store the number of
+ *  bytes in the character, or NULL.
+ *  \return The corresponding UTF-32 character, or zero if the character
+ *  is incomplete.
+ */
+unsigned long int cucul_utf8_to_utf32(char const *s, unsigned int *read)
+{
+    unsigned int bytes = trailing[(int)(unsigned char)*s];
+    unsigned int i = 0;
     uint32_t ret = 0;
 
-    switch(bytes)
-    {
-        /* FIXME: do something for invalid sequences (4 and 5) */
-        case 3: ret += (uint8_t)*s++; ret <<= 6;
-        case 2: ret += (uint8_t)*s++; ret <<= 6;
-        case 1: ret += (uint8_t)*s++; ret <<= 6;
-        case 0: ret += (uint8_t)*s++;
-    }
-
-    ret -= offsets[bytes];
-
-    return ret;
+    for(;;)
+    {
+        if(!*s)
+        {
+            if(read)
+                *read = 0;
+            return 0;
+        }
+
+        ret += ((uint32_t)(unsigned char)*s++) << (6 * (bytes - i));
+
+        if(bytes == i++)
+        {
+            if(read)
+                *read = i;
+            return ret - offsets[bytes];
+        }
+    }
 }
 

libcaca/trunk/cucul/conic.c

@@ -44 +44 @@
 {
     int test, dx, dy;
-    uint32_t ch = cucul_utf8_to_utf32(str);
+    uint32_t ch = cucul_utf8_to_utf32(str, NULL);
 
     /* Optimized Bresenham. Kick ass. */
@@ -139 +139 @@
     int y = b;
     int d1 = b*b - (a*a*b) + (a*a/4);
-    uint32_t ch = cucul_utf8_to_utf32(str);
+    uint32_t ch = cucul_utf8_to_utf32(str, NULL);
 
     ellipsepoints(cv, xo, yo, x, y, ch);

libcaca/trunk/cucul/cucul.h

@@ -124 +124 @@
  *
  *  @{ */
-extern unsigned long int cucul_utf8_to_utf32(char const *);
+extern unsigned long int cucul_utf8_to_utf32(char const *, unsigned int *);
 extern unsigned int cucul_utf32_to_utf8(char *, unsigned long int);
 extern unsigned char cucul_utf32_to_cp437(unsigned long int);

libcaca/trunk/cucul/line.c

@@ -62 +62 @@
     s.x2 = x2;
     s.y2 = y2;
-    s.ch = cucul_utf8_to_utf32(str);
+    s.ch = cucul_utf8_to_utf32(str, NULL);
     s.draw = draw_solid_line;
     clip_line(cv, &s);
@@ -90 +90 @@
     int i;
     struct line s;
-    s.ch = cucul_utf8_to_utf32(str);
+    s.ch = cucul_utf8_to_utf32(str, NULL);
     s.draw = draw_solid_line;
 

libcaca/trunk/cucul/triangle.c

@@ -110 +110 @@
     ymax = cv->height - 1;
 
-    ch = cucul_utf8_to_utf32(str);
+    ch = cucul_utf8_to_utf32(str, NULL);
 
     /* Rasterize our triangle */