Ignore:
Timestamp:
May 20, 2006, 7:29:24 AM (14 years ago)
Author:
Sam Hocevar
Message:
  • Renamed the event data member "ucs4" to "utf32" for consistency with "utf8".
Location:
libcaca/trunk/caca
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/caca.h

    r964 r969  
    5050 *      field is valid and contains either the ASCII value for the key, or
    5151 *      an \e enum \e caca_key value. If the value is a printable ASCII
    52  *      character, the \e data.key.ucs4 and \e data.key.utf8 fields are
    53  *      also filled and contain respectively the UCS-4/UTF-32 and the UTF-8
     52 *      character, the \e data.key.utf32 and \e data.key.utf8 fields are
     53 *      also filled and contain respectively the UTF-32/UCS-4 and the UTF-8
    5454 *      representations of the character. Otherwise, their content is
    5555 *      undefined.
     
    9393        struct { unsigned int x, y, button; } mouse;
    9494        struct { unsigned int w, h; } resize;
    95         struct { unsigned int ch; unsigned long int ucs4; char utf8[8]; } key;
     95        struct { unsigned int ch; unsigned long int utf32; char utf8[8]; } key;
    9696    } data;
    9797};
  • libcaca/trunk/caca/driver_conio.c

    r859 r969  
    136136    ev->type = CACA_EVENT_KEY_PRESS;
    137137    ev->data.key.ch = ch;
    138     ev->data.key.ucs4 = (uint32_t)ch;
     138    ev->data.key.utf32 = (uint32_t)ch;
    139139    ev->data.key.utf8[0] = ch;
    140140    ev->data.key.utf8[1] = '\0';
  • libcaca/trunk/caca/driver_gl.c

    r918 r969  
    477477            ev->type = CACA_EVENT_KEY_PRESS;
    478478            ev->data.key.ch = dp->drv.p->key;
    479             ev->data.key.ucs4 = (uint32_t)dp->drv.p->key;
     479            ev->data.key.utf32 = (uint32_t)dp->drv.p->key;
    480480            ev->data.key.utf8[0] = dp->drv.p->key;
    481481            ev->data.key.utf8[1] = '\0';
     
    515515
    516516            ev->type = CACA_EVENT_KEY_PRESS;
    517             ev->data.key.ucs4 = 0;
     517            ev->data.key.utf32 = 0;
    518518            ev->data.key.utf8[0] = '\0';
    519519
  • libcaca/trunk/caca/driver_ncurses.c

    r962 r969  
    429429
    430430    ev->type = CACA_EVENT_KEY_PRESS;
    431     ev->data.key.ucs4 = 0;
     431    ev->data.key.utf32 = 0;
    432432    ev->data.key.utf8[0] = '\0';
    433433    return 1;
  • libcaca/trunk/caca/driver_slang.c

    r962 r969  
    338338
    339339    ev->type = CACA_EVENT_KEY_PRESS;
    340     ev->data.key.ucs4 = 0;
     340    ev->data.key.utf32 = 0;
    341341    ev->data.key.utf8[0] = '\0';
    342342    return 1;
  • libcaca/trunk/caca/driver_win32.c

    r864 r969  
    257257            {
    258258                ev->data.key.ch = rec.Event.KeyEvent.uChar.AsciiChar;
    259                 ev->data.key.ucs4 = (uint32_t)ev->data.key.ch;
     259                ev->data.key.utf32 = (uint32_t)ev->data.key.ch;
    260260                ev->data.key.utf8[0] = ev->data.key.ch;
    261261                ev->data.key.utf8[1] = '\0';
  • libcaca/trunk/caca/driver_x11.c

    r947 r969  
    509509        {
    510510            ev->data.key.ch = key;
    511             ev->data.key.ucs4 = key;
     511            ev->data.key.utf32 = key;
    512512            ev->data.key.utf8[0] = key;
    513513            ev->data.key.utf8[1] = '\0';
     
    549549        }
    550550
    551         ev->data.key.ucs4 = 0;
     551        ev->data.key.utf32 = 0;
    552552        ev->data.key.utf8[0] = '\0';
    553553        return 1;
  • libcaca/trunk/caca/event.c

    r923 r969  
    202202        && dp->events.last_key_event.type
    203203        && ev->data.key.ch == dp->events.last_key_event.data.key.ch
    204         && ev->data.key.ucs4 == dp->events.last_key_event.data.key.ucs4)
     204        && ev->data.key.utf32 == dp->events.last_key_event.data.key.utf32)
    205205    {
    206206        dp->events.last_key_ticks = 0;
Note: See TracChangeset for help on using the changeset viewer.