Changeset 929 for libcaca/trunk/cacaTweet

Timestamp:

May 5, 2006, 4:03:40 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Factored more UTF32 to UTF8 conversions using _cucul_utf32_to_utf8().

Location:

libcaca/trunk/caca

Files:

• driver_ncurses.c (modified) (1 diff)
• driver_slang.c (modified) (1 diff)

libcaca/trunk/caca/driver_ncurses.c

@@ -488 +488 @@
 {
 #if defined(HAVE_NCURSESW_NCURSES_H)
-    static const uint8_t mark[7] =
-    {
-        0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
-    };
-
-    char buf[10], *parser;
+    char buf[10];
     int bytes;
-#endif
-
-    if(ch < 0x80)
-    {
-        addch(ch);
-        return;
-    }
-
-#if defined(HAVE_NCURSESW_NCURSES_H)
-    if(ch < 0x10000)
-    {
-        addch(ch); /* FIXME: doesn't work either */
-        return;
-    }
-
-    bytes = (ch < 0x800) ? 2 : (ch < 0x10000) ? 3 : 4;
+
+    bytes = _cucul_utf32_to_utf8(buf, ch);
     buf[bytes] = '\0';
-    parser = buf + bytes;
-
-    switch(bytes)
-    {
-        case 4: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-        case 3: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-        case 2: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-    }
-    *--parser = ch | mark[bytes];
-
     addstr(buf);
 #else
-    addch(' ');
+    addch(ch < 0x80 ? ch : '?');
 #endif
 }

libcaca/trunk/caca/driver_slang.c

@@ -393 +393 @@
 {
 #ifdef HAVE_SLSMG_UTF8_ENABLE
-    static const uint8_t mark[7] =
-    {
-        0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
-    };
-
-    char buf[10], *parser;
+    char buf[10];
     int bytes;
-#endif
-
-    if(ch < 0x80)
-    {
-        SLsmg_write_char(ch);
-        return;
-    }
-
-#ifdef HAVE_SLSMG_UTF8_ENABLE
-    bytes = (ch < 0x800) ? 2 : (ch < 0x10000) ? 3 : 4;
+
+    bytes = _cucul_utf32_to_utf8(buf, ch);
     buf[bytes] = '\0';
-    parser = buf + bytes;
-
-    switch(bytes)
-    {
-        case 4: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-        case 3: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-        case 2: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
-    }
-    *--parser = ch | mark[bytes];
-
     SLsmg_write_string(buf);
 #else
-    SLsmg_write_char(' ');
+    SLsmg_write_char(ch < 0x80 ? ch : ' ');
 #endif
 }