Changeset 28a5ebd in mainline for kernel/genarch/src/kbrd


Ignore:
Timestamp:
2020-06-18T15:39:50Z (6 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ce52c333
Parents:
4f663f3e
Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

Location:
kernel/genarch/src/kbrd
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/src/kbrd/kbrd.c

    r4f663f3e r28a5ebd  
    7676 * @param sc Scancode of the key being released.
    7777 */
    78 static void key_released(kbrd_instance_t *instance, wchar_t sc)
     78static void key_released(kbrd_instance_t *instance, char32_t sc)
    7979{
    8080        spinlock_lock(&instance->keylock);
    … …  
    103103 * @param sc Scancode of the key being pressed.
    104104 */
    105 static void key_pressed(kbrd_instance_t *instance, wchar_t sc)
     105static void key_pressed(kbrd_instance_t *instance, char32_t sc)
    106106{
    107107        bool letter;
    108108        bool shift;
    109109        bool capslock;
    110         wchar_t ch;
     110        char32_t ch;
    111111
    112112        spinlock_lock(&instance->keylock);
    … …  
    158158
    159159        while (true) {
    160                 wchar_t sc = indev_pop_character(&instance->raw);
     160                char32_t sc = indev_pop_character(&instance->raw);
    161161
    162162                if (sc == IGNORE_CODE)

  • kernel/genarch/src/kbrd/kbrd_at.c

    r4f663f3e r28a5ebd  
    5959#define AT_SCROLL_SCAN_CODE     0x7E
    6060
    61 static bool is_lock_key(wchar_t);
     61static bool is_lock_key(char32_t);
    6262
    6363static indev_operations_t kbrd_raw_ops = {
    … …  
    6969 * @param sc Scancode of the key being released.
    7070 */
    71 static void key_released(kbrd_instance_t *instance, wchar_t sc)
     71static void key_released(kbrd_instance_t *instance, char32_t sc)
    7272{
    7373        spinlock_lock(&instance->keylock);
    … …  
    9696 * @param sc Scancode of the key being pressed.
    9797 */
    98 static void key_pressed(kbrd_instance_t *instance, wchar_t sc)
     98static void key_pressed(kbrd_instance_t *instance, char32_t sc)
    9999{
    100100        bool letter;
    … …  
    140140
    141141        while (true) {
    142                 wchar_t sc = indev_pop_character(&instance->raw);
     142                char32_t sc = indev_pop_character(&instance->raw);
    143143
    144144                if (sc == AT_KEY_RELEASE) {
    … …  
    203203}
    204204
    205 static bool is_lock_key(wchar_t sc)
     205static bool is_lock_key(char32_t sc)
    206206{
    207207        return ((sc == AT_CAPS_SCAN_CODE) || (sc == AT_NUM_SCAN_CODE) ||

  • kernel/genarch/src/kbrd/scanc_at.c

    r4f663f3e r28a5ebd  
    3939
    4040/** Primary meaning of scancodes. */
    41 wchar_t sc_primary_map[] = {
     41char32_t sc_primary_map[] = {
    4242        U_NULL, /* 0x00 */
    4343        U_SPECIAL, /* 0x01 - F9 */
    … …  
    135135
    136136/** Secondary meaning of scancodes. */
    137 wchar_t sc_secondary_map[] = {
     137char32_t sc_secondary_map[] = {
    138138        U_NULL, /* 0x00 */
    139139        U_SPECIAL, /* 0x01 - F9 */

  • kernel/genarch/src/kbrd/scanc_mac.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        [0x00] = 'a',
    4444        [0x01] = 's',
    … …  
    172172
    173173/** Secondary meaning of scancodes. */
    174 wchar_t sc_secondary_map[SCANCODES] = {
     174char32_t sc_secondary_map[SCANCODES] = {
    175175        [0x00] = 'A',
    176176        [0x01] = 'S',

  • kernel/genarch/src/kbrd/scanc_pc.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        U_NULL,         /* 0x00 - undefined */
    4444        U_ESCAPE,       /* 0x01 - Esc */
    … …  
    129129
    130130/** Secondary meaning of scancodes. */
    131 wchar_t sc_secondary_map[SCANCODES] = {
     131char32_t sc_secondary_map[SCANCODES] = {
    132132        U_NULL,         /* 0x00 - undefined */
    133133        U_ESCAPE,       /* 0x01 - Esc */

  • kernel/genarch/src/kbrd/scanc_sun.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        [0x00] = U_SPECIAL,
    4444        [0x01] = U_SPECIAL,
    … …  
    172172
    173173/** Secondary meaning of scancodes. */
    174 wchar_t sc_secondary_map[SCANCODES] = {
     174char32_t sc_secondary_map[SCANCODES] = {
    175175        [0x00] = U_SPECIAL,
    176176        [0x01] = U_SPECIAL,
Note: See TracChangeset for help on using the changeset viewer.