Changeset 643 for libcaca/trunk/cacaTweet

Timestamp:

Mar 17, 2006, 2:32:58 PM (14 years ago)

Author:

Sam Hocevar

Message:

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

Location:

libcaca/trunk/caca

Files:

• driver_conio.c (modified) (3 diffs)
• driver_vga.c (modified) (3 diffs)

libcaca/trunk/caca/driver_conio.c

@@ -34 +34 @@
 #include "cucul.h"
 #include "cucul_internals.h"
-
-static uint8_t conio_utf32_to_cp437(uint32_t);
 
 struct driver_private
@@ -107 +105 @@
     for(n = kk->qq->height * kk->qq->width; n--; )
     {
-        *screen++ = conio_utf32_to_cp437(*chars++);
+        *screen++ = _cucul_utf32_to_cp437(*chars++);
         *screen++ = *attr++;
     }
@@ -137 +135 @@
 
 /*
- * 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
  */

libcaca/trunk/caca/driver_vga.c

@@ -26 +26 @@
 #include "cucul.h"
 #include "cucul_internals.h"
-
-static uint8_t vga_utf32_to_cp437(uint32_t);
 
 /* Address of the VGA screen */
@@ -125 +123 @@
     for(n = kk->qq->height * kk->qq->width; n--; )
     {
-        *screen++ = vga_utf32_to_cp437(*chars++);
+        *screen++ = _cucul_utf32_to_cp437(*chars++);
         *screen++ = *attr++;
     }
@@ -141 +139 @@
     /* FIXME */
     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 '?';
 }