Changeset 28a5ebd in mainline for uspace/dist/src/c/demos/edit/sheet.c

Timestamp:

2020-06-18T15:39:50Z (4 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.

File:

• uspace/dist/src/c/demos/edit/sheet.c (modified) (5 diffs)

uspace/dist/src/c/demos/edit/sheet.c

@@ -193 +193 @@
         size_t copy_sz;
         size_t off, prev;
-        wchar_t c;
+        char32_t c;
 
         spp = sh->data + spos->b_off;
@@ -220 +220 @@
 {
         size_t cur_pos, prev_pos;
-        wchar_t c;
+        char32_t c;
         coord_t cc;
 
@@ -289 +289 @@
         size_t off;
         coord_t cc;
-        wchar_t c;
+        char32_t c;
         sheet_t *sh;
 
@@ -318 +318 @@
 
 /** Get a character at spt and return next spt */
-wchar_t spt_next_char(spt_t spt, spt_t *next)
-{
-        wchar_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
+char32_t spt_next_char(spt_t spt, spt_t *next)
+{
+        char32_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
         if (next)
                 *next = spt;
@@ -326 +326 @@
 }
 
-wchar_t spt_prev_char(spt_t spt, spt_t *prev)
-{
-        wchar_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
+char32_t spt_prev_char(spt_t spt, spt_t *prev)
+{
+        char32_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
         if (prev)
                 *prev = spt;