Changeset 627


Ignore:
Timestamp:
Mar 15, 2006, 11:07:55 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Added support for Unicode characters that fall into CP437 0x01 - 0x1f to the DOS/conio.h driver, and updated the unicode test accordingly.
Location:
libcaca/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/driver_conio.c

    r625 r627  
    142142static uint8_t conio_utf32_to_cp437(uint32_t c)
    143143{
    144     static uint32_t const lookup[] =
    145     {
    146         /* 0x7f */
     144    static uint32_t const lookup1[] =
     145    {
     146        /* 0x01 - 0x0f: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ */
     147                0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
     148        0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
     149        /* 0x10 - 0x1f: ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼ */
     150        0x25ba, 0x25c4, 0x2195, 0x203c, 0xb6, 0xa7, 0x25ac, 0x21a8,
     151        0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc
     152    };
     153
     154    static uint32_t const lookup2[] =
     155    {
     156        /* 0x7f: ⌂ */
    147157        0x2302,
    148         /* 0x80 - 0x8f */
     158        /* 0x80 - 0x8f: Ç ü é â ä à å ç ê ë è ï î ì Ä Å */
    149159        0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,
    150160        0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
    151         /* 0x90 - 0x9f */
     161        /* 0x90 - 0x9f: É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ */
    152162        0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,
    153163        0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x20a7, 0x192,
    154         /* 0xa0 - 0xaf */
     164        /* 0xa0 - 0xaf: á í ó ú ñ Ñ ª º ¿ ⌐ ¬ ½ ¼ ¡ « » */
    155165        0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,
    156166        0xbf, 0x2310, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
    157         /* 0xb0 - 0xbf */
     167        /* 0xb0 - 0xbf: ░ ▒ ▓ │ ┤ ╡ ╢ ╖ ╕ ╣ ║ ╗ ╝ ╜ ╛ ┐ */
    158168        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
    159169        0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
    160         /* 0xc0 - 0xcf */
     170        /* 0xc0 - 0xcf: └ ┴ ┬ ├ ─ ┼ ╞ ╟ ╚ ╔ ╩ ╦ ╠ ═ ╬ ╧ */
    161171        0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
    162172        0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
    163         /* 0xd0 - 0xdf */
     173        /* 0xd0 - 0xdf: ╨ ╤ ╥ ╙ ╘ ╒ ╓ ╫ ╪ ┘ ┌ █ ▄ ▌ ▐ ▀ */
    164174        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
    165175        0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
    166         /* 0xe0 - 0xef */
     176        /* 0xe0 - 0xef: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ */
    167177        0x3b1, 0xdf, 0x393, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
    168178        0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0x3c6, 0x3b5, 0x2229,
    169         /* 0xf0 - 0xff */
     179        /* 0xf0 - 0xff: ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ <nbsp> */
    170180        0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
    171181        0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x25a0, 0xa0
     
    180190        return c;
    181191
    182     for(i = 0; i < sizeof(lookup) / sizeof(*lookup); i++)
    183     {
    184         if(lookup[i] == c)
     192    for(i = 0; i < sizeof(lookup1) / sizeof(*lookup1); i++)
     193    {
     194        if(lookup1[i] == c)
     195            return 0x01 + i;
     196    }
     197
     198    for(i = 0; i < sizeof(lookup2) / sizeof(*lookup2); i++)
     199    {
     200        if(lookup2[i] == c)
    185201            return 0x7f + i;
    186202    }
  • libcaca/trunk/test/unicode.c

    r626 r627  
    3838    cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
    3939    cucul_putstr(qq, 1, 2, "This is ASCII:    | abc DEF 123 !@# |");
    40     cucul_putstr(qq, 1, 3, "This is Unicode:  | äßç δεφ ░▒▓ ╞╬╗ |");
     40    cucul_putstr(qq, 1, 3, "This is Unicode:  | äßç δεφ ☺♥♀ ╞╬╗ |");
    4141    cucul_putstr(qq, 1, 4, "And this is, too: | ἀβϛ ΔЗҒ ᚴᛒᛯ ♩♔✈ |");
    4242
Note: See TracChangeset for help on using the changeset viewer.