Changeset 929 for libcaca/trunk/tools/makefont.cTweet

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().

File:

• libcaca/trunk/tools/makefont.c (modified) (2 diffs)

libcaca/trunk/tools/makefont.c

@@ -27 +27 @@
 #   include <netinet/in.h>
 #endif
+
+#include "cucul.h"
+#include "cucul_internals.h"
 
 #include <pango/pango.h>
@@ -200 +203 @@
         {
             unsigned int ch = i;
-            char buf[10], *parser;
+            char buf[10];
             int x, y, bytes;
 
-            if(ch < 0x80)
-            {
-                bytes = 1;
-                buf[0] = ch;
-                buf[1] = '\0';
-            }
-            else
-            {
-                static const unsigned char mark[7] =
-                {
-                    0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
-                };
-
-                /* FIXME: use libcucul instead of this shit */
-                bytes = (ch < 0x800) ? 2 : (ch < 0x10000) ? 3 : 4;
-                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];
-            }
+            bytes = _cucul_utf32_to_utf8(buf, ch);
+            buf[bytes] = '\0';
 
             /* Print glyph value in comment */