Changeset 28a5ebd in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2020-06-18T15:39:50Z (5 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:
uspace/lib/c/include
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/io/charfield.h

    r4f663f3e r28a5ebd  
    3838
    3939#include <stdbool.h>
    40 #include <wchar.h>
     40#include <uchar.h>
    4141#include <io/color.h>
    4242#include <io/style.h>
    … …  
    7777
    7878typedef struct {
    79         wchar_t ch;
     79        char32_t ch;
    8080        char_attrs_t attrs;
    8181        char_flags_t flags;

  • uspace/lib/c/include/io/chargrid.h

    r4f663f3e r28a5ebd  
    7979extern sysarg_t chargrid_get_top_row(chargrid_t *);
    8080
    81 extern sysarg_t chargrid_putwchar(chargrid_t *, wchar_t, bool);
     81extern sysarg_t chargrid_putuchar(chargrid_t *, char32_t, bool);
    8282extern sysarg_t chargrid_newline(chargrid_t *);
    8383extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t);

  • uspace/lib/c/include/io/input.h

    r4f663f3e r28a5ebd  
    5050        errno_t (*active)(input_t *);
    5151        errno_t (*deactive)(input_t *);
    52         errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
     52        errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
    5353        errno_t (*move)(input_t *, int, int);
    5454        errno_t (*abs_move)(input_t *, unsigned, unsigned, unsigned, unsigned);

  • uspace/lib/c/include/io/kbd_event.h

    r4f663f3e r28a5ebd  
    5959
    6060        /** The character that was generated or '\0' for none. */
    61         wchar_t c;
     61        char32_t c;
    6262} kbd_event_t;
    6363

  • uspace/lib/c/include/io/printf_core.h

    r4f663f3e r28a5ebd  
    3838#include <stddef.h>
    3939#include <stdarg.h>
     40#include <uchar.h>
    4041
    4142/** Structure for specifying output methods for different printf clones. */
    … …  
    4546
    4647        /* Wide string output function, returns number of printed characters or EOF */
    47         int (*wstr_write)(const wchar_t *, size_t, void *);
     48        int (*wstr_write)(const char32_t *, size_t, void *);
    4849
    4950        /* User data - output stream specification, state, locks, etc. */

  • uspace/lib/c/include/stdio.h

    r4f663f3e r28a5ebd  
    4242#include <_bits/size_t.h>
    4343#include <_bits/wchar_t.h>
     44#include <_bits/uchar.h>
    4445#include <_bits/wint_t.h>
    4546#include <_bits/decls.h>
    … …  
    123124extern wint_t fputwc(wchar_t, FILE *);
    124125extern wint_t putwchar(wchar_t);
     126
     127extern wint_t fputuc(char32_t, FILE *);
     128extern wint_t putuchar(char32_t);
    125129
    126130/* Formatted string output functions */

  • uspace/lib/c/include/stdlib.h

    r4f663f3e r28a5ebd  
    3838#include <_bits/size_t.h>
    3939#include <_bits/wchar_t.h>
     40#include <_bits/uchar.h>
    4041#include <_bits/decls.h>
    4142#include <bsearch.h>

  • uspace/lib/c/include/str.h

    r4f663f3e r28a5ebd  
    6767__HELENOS_DECLS_BEGIN;
    6868
    69 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
    70 extern wchar_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
    71 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
     69extern char32_t str_decode(const char *str, size_t *offset, size_t sz);
     70extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
     71extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz);
    7272
    7373extern size_t str_size(const char *str);
    74 extern size_t wstr_size(const wchar_t *str);
     74extern size_t wstr_size(const char32_t *str);
    7575
    7676extern size_t str_nsize(const char *str, size_t max_size);
    77 extern size_t wstr_nsize(const wchar_t *str, size_t max_size);
     77extern size_t wstr_nsize(const char32_t *str, size_t max_size);
    7878
    7979extern size_t str_lsize(const char *str, size_t max_len);
    80 extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
     80extern size_t wstr_lsize(const char32_t *str, size_t max_len);
    8181
    8282extern size_t str_length(const char *str);
    83 extern size_t wstr_length(const wchar_t *wstr);
     83extern size_t wstr_length(const char32_t *wstr);
    8484
    8585extern size_t str_nlength(const char *str, size_t size);
    86 extern size_t wstr_nlength(const wchar_t *str, size_t size);
     86extern size_t wstr_nlength(const char32_t *str, size_t size);
    8787
    88 extern size_t chr_width(wchar_t ch);
     88extern size_t chr_width(char32_t ch);
    8989extern size_t str_width(const char *str);
    9090
    91 extern bool ascii_check(wchar_t ch);
    92 extern bool chr_check(wchar_t ch);
     91extern bool ascii_check(char32_t ch);
     92extern bool chr_check(char32_t ch);
    9393
    9494extern int str_cmp(const char *s1, const char *s2);
    … …  
    105105
    106106extern errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n);
    107 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
    108 extern char *wstr_to_astr(const wchar_t *src);
    109 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
    110 extern wchar_t *str_to_awstr(const char *src);
     107extern void wstr_to_str(char *dest, size_t size, const char32_t *src);
     108extern char *wstr_to_astr(const char32_t *src);
     109extern void str_to_wstr(char32_t *dest, size_t dlen, const char *src);
     110extern char32_t *str_to_awstr(const char *src);
    111111extern errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src);
    112112extern errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src);
    113113extern size_t utf16_wsize(const uint16_t *ustr);
    114114
    115 extern char *str_chr(const char *str, wchar_t ch);
    116 extern char *str_rchr(const char *str, wchar_t ch);
     115extern char *str_chr(const char *str, char32_t ch);
     116extern char *str_rchr(const char *str, char32_t ch);
    117117extern char *str_str(const char *hs, const char *n);
    118118
    119 extern void str_rtrim(char *str, wchar_t ch);
    120 extern void str_ltrim(char *str, wchar_t ch);
     119extern void str_rtrim(char *str, char32_t ch);
     120extern void str_ltrim(char *str, char32_t ch);
    121121
    122 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
    123 extern bool wstr_remove(wchar_t *str, size_t pos);
     122extern bool wstr_linsert(char32_t *str, char32_t ch, size_t pos, size_t max_pos);
     123extern bool wstr_remove(char32_t *str, size_t pos);
    124124
    125125extern char *str_dup(const char *src);
Note: See TracChangeset for help on using the changeset viewer.