Changeset 28a5ebd in mainline for uspace/dist/src/c/demos/edit/edit.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/edit.c (modified) (12 diffs)

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

@@ -147 +147 @@
 static void pane_caret_display(void);
 
-static void insert_char(wchar_t c);
+static void insert_char(char32_t c);
 static void delete_char_before(void);
 static void delete_char_after(void);
@@ -630 +630 @@
         kbd_event_t *kev;
         char *str;
-        wchar_t buffer[INFNAME_MAX_LEN + 1];
+        char32_t buffer[INFNAME_MAX_LEN + 1];
         int max_len;
         int nc;
@@ -670 +670 @@
                                 default:
                                         if (kev->c >= 32 && nc < max_len) {
-                                                putwchar(kev->c);
+                                                putuchar(kev->c);
                                                 console_flush(con);
                                                 buffer[nc++] = kev->c;
@@ -696 +696 @@
 {
         FILE *f;
-        wchar_t c;
+        char32_t c;
         char buf[BUF_SIZE];
         int bcnt;
@@ -847 +847 @@
         coord_t rbc, rec;
         char row_buf[ROW_BUF_SIZE];
-        wchar_t c;
+        char32_t c;
         size_t pos, size;
         int s_column;
@@ -1052 +1052 @@
 
 /** Insert a character at caret position. */
-static void insert_char(wchar_t c)
+static void insert_char(char32_t c)
 {
         spt_t pt;
@@ -1282 +1282 @@
 
 /* Search operations */
-static errno_t search_spt_producer(void *data, wchar_t *ret)
+static errno_t search_spt_producer(void *data, char32_t *ret)
 {
         assert(data != NULL);
@@ -1291 +1291 @@
 }
 
-static errno_t search_spt_reverse_producer(void *data, wchar_t *ret)
+static errno_t search_spt_reverse_producer(void *data, char32_t *ret)
 {
         assert(data != NULL);
@@ -1510 +1510 @@
         char *str;
         size_t off;
-        wchar_t c;
+        char32_t c;
         errno_t rc;
 
@@ -1606 +1606 @@
 }
 
-static wchar_t get_first_wchar(const char *str)
+static char32_t get_first_wchar(const char *str)
 {
         size_t offset = 0;
@@ -1627 +1627 @@
                 return false;
 
-        wchar_t first_char = get_first_wchar(ch);
+        char32_t first_char = get_first_wchar(ch);
         switch (first_char) {
         case ' ':
@@ -1653 +1653 @@
                 return false;
 
-        wchar_t first_char = get_first_wchar(ch);
+        char32_t first_char = get_first_wchar(ch);
         switch (first_char) {
         case ',':