* Factorised some charset handling code into a new cucul/charset.c file.

caca/driver_conio.c

@@ -34,8 +34,6 @@
 #include "cucul.h"
 #include "cucul_internals.h"
 
-static uint8_t conio_utf32_to_cp437(uint32_t);
-
 struct driver_private
 {
     struct text_info ti;
@@ -106,7 +104,7 @@ static void conio_display(caca_t *kk)
 
     for(n = kk->qq->height * kk->qq->width; n--; )
     {
-        *screen++ = conio_utf32_to_cp437(*chars++);
+        *screen++ = _cucul_utf32_to_cp437(*chars++);
         *screen++ = *attr++;
     }
 #   if defined(SCREENUPDATE_IN_PC_H)
@@ -135,71 +133,6 @@ static unsigned int conio_get_event(caca_t *kk)
     return CACA_EVENT_KEY_PRESS | event;
 }
 
-/*
- * XXX: following functions are local
- */
-
-static uint8_t conio_utf32_to_cp437(uint32_t c)
-{
-    static uint32_t const lookup1[] =
-    {
-        /* 0x01 - 0x0f: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ */
-                0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
-        0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
-        /* 0x10 - 0x1f: ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼ */
-        0x25ba, 0x25c4, 0x2195, 0x203c, 0xb6, 0xa7, 0x25ac, 0x21a8,
-        0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc
-    };
-
-    static uint32_t const lookup2[] =
-    {
-        /* 0x7f: ⌂ */
-        0x2302,
-        /* 0x80 - 0x8f: Ç ü é â ä à å ç ê ë è ï î ì Ä Å */
-        0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,
-        0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
-        /* 0x90 - 0x9f: É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ */
-        0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,
-        0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x20a7, 0x192,
-        /* 0xa0 - 0xaf: á í ó ú ñ Ñ ª º ¿ ⌐ ¬ ½ ¼ ¡ « » */
-        0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,
-        0xbf, 0x2310, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
-        /* 0xb0 - 0xbf: ░ ▒ ▓ │ ┤ ╡ ╢ ╖ ╕ ╣ ║ ╗ ╝ ╜ ╛ ┐ */
-        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-        0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
-        /* 0xc0 - 0xcf: └ ┴ ┬ ├ ─ ┼ ╞ ╟ ╚ ╔ ╩ ╦ ╠ ═ ╬ ╧ */
-        0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
-        0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
-        /* 0xd0 - 0xdf: ╨ ╤ ╥ ╙ ╘ ╒ ╓ ╫ ╪ ┘ ┌ █ ▄ ▌ ▐ ▀ */
-        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
-        0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
-        /* 0xe0 - 0xef: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ */
-        0x3b1, 0xdf, 0x393, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
-        0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0x3c6, 0x3b5, 0x2229,
-        /* 0xf0 - 0xff: ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ <nbsp> */
-        0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
-        0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x25a0, 0xa0
-    };
-
-    unsigned int i;
- 
-    if(c < 0x00000020)
-        return '?';
-
-    if(c < 0x00000080)
-        return c;
-
-    for(i = 0; i < sizeof(lookup1) / sizeof(*lookup1); i++)
-        if(lookup1[i] == c)
-            return 0x01 + i;
-
-    for(i = 0; i < sizeof(lookup2) / sizeof(*lookup2); i++)
-        if(lookup2[i] == c)
-            return 0x7f + i;
-
-    return '?';
-}
-
 /*
  * Driver initialisation
  */

caca/driver_vga.c

@@ -26,8 +26,6 @@
 #include "cucul.h"
 #include "cucul_internals.h"
 
-static uint8_t vga_utf32_to_cp437(uint32_t);
-
 /* Address of the VGA screen */
 #define VGA_SCREEN ((char *)(intptr_t)0x000b8000)
 
@@ -124,7 +122,7 @@ static void vga_display(caca_t *kk)
 
     for(n = kk->qq->height * kk->qq->width; n--; )
     {
-        *screen++ = vga_utf32_to_cp437(*chars++);
+        *screen++ = _cucul_utf32_to_cp437(*chars++);
         *screen++ = *attr++;
     }
 }
@@ -142,71 +140,6 @@ static unsigned int vga_get_event(caca_t *kk)
     return CACA_EVENT_NONE;
 }
 
-/*
- * XXX: following functions are local
- */
-
-static uint8_t vga_utf32_to_cp437(uint32_t c)
-{
-    static uint32_t const lookup1[] =
-    {
-        /* 0x01 - 0x0f: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ */
-                0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
-        0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
-        /* 0x10 - 0x1f: ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼ */
-        0x25ba, 0x25c4, 0x2195, 0x203c, 0xb6, 0xa7, 0x25ac, 0x21a8,
-        0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc
-    };
-
-    static uint32_t const lookup2[] =
-    {
-        /* 0x7f: ⌂ */
-        0x2302,
-        /* 0x80 - 0x8f: Ç ü é â ä à å ç ê ë è ï î ì Ä Å */
-        0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,
-        0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
-        /* 0x90 - 0x9f: É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ */
-        0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,
-        0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x20a7, 0x192,
-        /* 0xa0 - 0xaf: á í ó ú ñ Ñ ª º ¿ ⌐ ¬ ½ ¼ ¡ « » */
-        0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,
-        0xbf, 0x2310, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
-        /* 0xb0 - 0xbf: ░ ▒ ▓ │ ┤ ╡ ╢ ╖ ╕ ╣ ║ ╗ ╝ ╜ ╛ ┐ */
-        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-        0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
-        /* 0xc0 - 0xcf: └ ┴ ┬ ├ ─ ┼ ╞ ╟ ╚ ╔ ╩ ╦ ╠ ═ ╬ ╧ */
-        0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
-        0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
-        /* 0xd0 - 0xdf: ╨ ╤ ╥ ╙ ╘ ╒ ╓ ╫ ╪ ┘ ┌ █ ▄ ▌ ▐ ▀ */
-        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
-        0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
-        /* 0xe0 - 0xef: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ */
-        0x3b1, 0xdf, 0x393, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
-        0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0x3c6, 0x3b5, 0x2229,
-        /* 0xf0 - 0xff: ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ <nbsp> */
-        0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
-        0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x25a0, 0xa0
-    };
-
-    unsigned int i;
-
-    if(c < 0x00000020)
-        return '?';
-
-    if(c < 0x00000080)
-        return c;
-
-    for(i = 0; i < sizeof(lookup1) / sizeof(*lookup1); i++)
-        if(lookup1[i] == c)
-            return 0x01 + i;
-
-    for(i = 0; i < sizeof(lookup2) / sizeof(*lookup2); i++)
-        if(lookup2[i] == c)
-            return 0x7f + i;
-
-    return '?';
-}
-
 /*
  * Driver initialisation
  */

cucul/Makefile.am

@@ -9,6 +9,7 @@ libcucul_la_SOURCES = \
 	cucul.h \
 	cucul_internals.h \
 	char.c \
+	charset.c \
 	math.c \
 	line.c \
 	box.c \

cucul/char.c

@@ -38,10 +38,6 @@
 #include "cucul.h"
 #include "cucul_internals.h"
 
-size_t utf8_strlen(const char *s);
-const char *utf8_skip(const char *s, size_t x);
-uint32_t utf8_to_utf32(const char *s);
-
 /** \brief Set the default colour pair.
  *
  *  This function sets the default colour pair. String functions such as
@@ -157,14 +153,14 @@ void cucul_putstr(cucul_t *qq, int x, int y, char const *s)
     if(y < 0 || y >= (int)qq->height || x >= (int)qq->width)
         return;
 
-    len = utf8_strlen(s);
+    len = _cucul_strlen_utf8(s);
 
     if(x < 0)
     {
         if(len < (unsigned int)-x)
             return;
         len -= -x;
-        s = utf8_skip(s, -x);
+        s = _cucul_skip_utf8(s, -x);
         x = 0;
     }
 
@@ -176,10 +172,10 @@ void cucul_putstr(cucul_t *qq, int x, int y, char const *s)
 
     while(len)
     {
-        *chars++ = utf8_to_utf32(s);
+        *chars++ = _cucul_utf8_to_utf32(s);
         *attr++ = (qq->bgcolor << 4) | qq->fgcolor;
 
-        s = utf8_skip(s, 1);
+        s = _cucul_skip_utf8(s, 1);
         len--;
     }
 }
@@ -261,83 +257,3 @@ void cucul_clear(cucul_t *qq)
     cucul_set_color(qq, oldfg, oldbg);
 }
 
-/*
- * XXX: The following functions are local.
- */
-
-static const char trailing[256] =
-{
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-static const uint32_t offsets[6] =
-{
-    0x00000000UL, 0x00003080UL, 0x000E2080UL,
-    0x03C82080UL, 0xFA082080UL, 0x82082080UL
-};
-
-size_t utf8_strlen(const char *s)
-{
-    int len = 0;
-    const char *parser = s;
-
-    while(*parser)
-    {
-        int i;
-        int bytes = 1 + trailing[(int)(unsigned char)*parser];
-
-        for(i = 1; i < bytes; i++)
-            if(!parser[i])
-                return len;
-        parser += bytes;
-        len++;
-    }
-
-    return len;
-}
-
-const char *utf8_skip(const char *s, size_t x)
-{
-    const char *parser = s;
-
-    while(x)
-    {
-        int i;
-        int bytes = 1 + trailing[(int)(unsigned char)*parser];
-
-        for(i = 1; i < bytes; i++)
-            if(!parser[i])
-                return parser;
-        parser += bytes;
-        x--;
-    }
-
-    return parser;
-}
-
-uint32_t utf8_to_utf32(const char *s)
-{
-    int bytes = trailing[(int)(unsigned char)*s];
-    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;
-}
-

cucul/charset.c

@@ -0,0 +1,184 @@
+/*
+ *  libcucul      Unicode canvas library
+ *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
+ *                All Rights Reserved
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the Do What The Fuck You Want To
+ *  Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
+ */
+
+/** \file charset.c
+ *  \version \$Id$
+ *  \author Sam Hocevar <sam@zoy.org>
+ *  \brief Character set conversions
+ *
+ *  This file contains functions for converting characters between
+ *  various character sets.
+ */
+
+#include "config.h"
+
+#if !defined(__KERNEL__)
+#   include <string.h>
+#endif
+
+#include "cucul.h"
+#include "cucul_internals.h"
+
+static char const trailing[256] =
+{
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+static uint32_t const offsets[6] =
+{
+    0x00000000UL, 0x00003080UL, 0x000E2080UL,
+    0x03C82080UL, 0xFA082080UL, 0x82082080UL
+};
+
+unsigned int _cucul_strlen_utf8(char const *s)
+{
+    int len = 0;
+    char const *parser = s;
+
+    while(*parser)
+    {
+        int i;
+        int bytes = 1 + trailing[(int)(unsigned char)*parser];
+
+        for(i = 1; i < bytes; i++)
+            if(!parser[i])
+                return len;
+        parser += bytes;
+        len++;
+    }
+
+    return len;
+}
+
+char const *_cucul_skip_utf8(char const *s, unsigned int x)
+{
+    char const *parser = s;
+
+    while(x)
+    {
+        int i;
+        int bytes = 1 + trailing[(int)(unsigned char)*parser];
+
+        for(i = 1; i < bytes; i++)
+            if(!parser[i])
+                return parser;
+        parser += bytes;
+        x--;
+    }
+
+    return parser;
+}
+
+uint32_t _cucul_utf8_to_utf32(char const *s)
+{
+    int bytes = trailing[(int)(unsigned char)*s];
+    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;
+}
+
+/*
+ * CP437 handling
+ */
+
+static uint32_t const cp437_lookup1[] =
+{
+    /* 0x01 - 0x0f: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ */
+            0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
+    0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
+    /* 0x10 - 0x1f: ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼ */
+    0x25ba, 0x25c4, 0x2195, 0x203c, 0xb6, 0xa7, 0x25ac, 0x21a8,
+    0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc
+};
+
+static uint32_t const cp437_lookup2[] =
+{
+    /* 0x7f: ⌂ */
+    0x2302,
+    /* 0x80 - 0x8f: Ç ü é â ä à å ç ê ë è ï î ì Ä Å */
+    0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,
+    0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
+    /* 0x90 - 0x9f: É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ */
+    0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,
+    0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x20a7, 0x192,
+    /* 0xa0 - 0xaf: á í ó ú ñ Ñ ª º ¿ ⌐ ¬ ½ ¼ ¡ « » */
+    0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,
+    0xbf, 0x2310, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
+    /* 0xb0 - 0xbf: ░ ▒ ▓ │ ┤ ╡ ╢ ╖ ╕ ╣ ║ ╗ ╝ ╜ ╛ ┐ */
+    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+    0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
+    /* 0xc0 - 0xcf: └ ┴ ┬ ├ ─ ┼ ╞ ╟ ╚ ╔ ╩ ╦ ╠ ═ ╬ ╧ */
+    0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
+    0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
+    /* 0xd0 - 0xdf: ╨ ╤ ╥ ╙ ╘ ╒ ╓ ╫ ╪ ┘ ┌ █ ▄ ▌ ▐ ▀ */
+    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
+    0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
+    /* 0xe0 - 0xef: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ */
+    0x3b1, 0xdf, 0x393, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
+    0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0x3c6, 0x3b5, 0x2229,
+    /* 0xf0 - 0xff: ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ <nbsp> */
+    0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
+    0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x25a0, 0xa0
+};
+
+uint8_t _cucul_utf32_to_cp437(uint32_t c)
+{
+    unsigned int i;
+
+    if(c < 0x00000020)
+        return '?';
+
+    if(c < 0x00000080)
+        return c;
+
+    for(i = 0; i < sizeof(cp437_lookup1) / sizeof(*cp437_lookup1); i++)
+        if(cp437_lookup1[i] == c)
+            return 0x01 + i;
+
+    for(i = 0; i < sizeof(cp437_lookup2) / sizeof(*cp437_lookup2); i++)
+        if(cp437_lookup2[i] == c)
+            return 0x7f + i;
+
+    return '?';
+}
+
+uint32_t _cucul_cp437_to_utf32(uint8_t c)
+{
+    if(c > 0x7f)
+        return cp437_lookup2[c - 0x7f];
+
+    if(c >= 0x20)
+        return (uint32_t)c;
+
+    if(c > 0)
+        return cp437_lookup1[c - 0x01];
+
+    return 0x00000000;
+}
+

cucul/cucul_internals.h

@@ -54,5 +54,19 @@ extern int _cucul_init_bitmap(void);
 extern int _cucul_end_bitmap(void);
 void _cucul_set_size(cucul_t *qq, unsigned int width, unsigned int height);
 
+/* Charset functions */
+unsigned int _cucul_strlen_utf8(char const *s);
+char const *_cucul_skip_utf8(char const *s, unsigned int x);
+uint32_t _cucul_utf8_to_utf32(char const *s);
+uint8_t _cucul_utf32_to_cp437(uint32_t c);
+uint32_t _cucul_cp437_to_utf32(uint8_t c);
+
+/* Export functions */
+void _cucul_get_ansi(cucul_t *qq, struct cucul_buffer *ex);
+void _cucul_get_html(cucul_t *qq, struct cucul_buffer *ex);
+void _cucul_get_html3(cucul_t *qq, struct cucul_buffer *ex);
+void _cucul_get_irc(cucul_t *qq, struct cucul_buffer *ex);
+void _cucul_get_ps(cucul_t *qq, struct cucul_buffer *ex);
+void _cucul_get_svg(cucul_t *qq, struct cucul_buffer *ex);
 
 #endif /* __CUCUL_INTERNALS_H__ */