Changes in uspace/lib/clui/tinput.c [28a5ebd:68f1254c] in mainline

File:

• uspace/lib/clui/tinput.c (modified) (12 diffs)

uspace/lib/clui/tinput.c

@@ -113 +113 @@
 static void tinput_display_tail(tinput_t *ti, size_t start, size_t pad)
 {
-        char32_t *dbuf = malloc((INPUT_MAX_SIZE + 1) * sizeof(char32_t));
+        wchar_t *dbuf = malloc((INPUT_MAX_SIZE + 1) * sizeof(wchar_t));
         if (!dbuf)
                 return;
@@ -126 +126 @@
         size_t p = start;
         if (p < sa) {
-                memcpy(dbuf, ti->buffer + p, (sa - p) * sizeof(char32_t));
+                memcpy(dbuf, ti->buffer + p, (sa - p) * sizeof(wchar_t));
                 dbuf[sa - p] = '\0';
                 printf("%ls", dbuf);
@@ -137 +137 @@
 
                 memcpy(dbuf, ti->buffer + p,
-                    (sb - p) * sizeof(char32_t));
+                    (sb - p) * sizeof(wchar_t));
                 dbuf[sb - p] = '\0';
                 printf("%ls", dbuf);
@@ -148 +148 @@
         if (p < ti->nc) {
                 memcpy(dbuf, ti->buffer + p,
-                    (ti->nc - p) * sizeof(char32_t));
+                    (ti->nc - p) * sizeof(wchar_t));
                 dbuf[ti->nc - p] = '\0';
                 printf("%ls", dbuf);
@@ -154 +154 @@
 
         for (p = 0; p < pad; p++)
-                putuchar(' ');
+                putwchar(' ');
 
         console_flush(ti->console);
@@ -192 +192 @@
         tinput_console_set_lpos(ti, ti->text_coord + ti->nc);
         console_flush(ti->console);
-        putuchar('\n');
+        putwchar('\n');
 }
 
@@ -212 +212 @@
 }
 
-static void tinput_insert_char(tinput_t *ti, char32_t c)
+static void tinput_insert_char(tinput_t *ti, wchar_t c)
 {
         if (ti->nc == INPUT_MAX_SIZE)
@@ -263 +263 @@
         size_t i = 0;
         while (i < ilen) {
-                char32_t c = str_decode(str, &off, STR_NO_LIMIT);
+                wchar_t c = str_decode(str, &off, STR_NO_LIMIT);
                 if (c == '\0')
                         break;
@@ -506 +506 @@
 
         memmove(ti->buffer + sa, ti->buffer + sb,
-            (ti->nc - sb) * sizeof(char32_t));
+            (ti->nc - sb) * sizeof(wchar_t));
 
         ti->pos = ti->sel_start = sa;
@@ -526 +526 @@
 
         if (sb < ti->nc) {
-                char32_t tmp_c = ti->buffer[sb];
+                wchar_t tmp_c = ti->buffer[sb];
                 ti->buffer[sb] = '\0';
                 str = wstr_to_astr(ti->buffer + sa);
@@ -602 +602 @@
         size_t i;
         size_t a_off, b_off;
-        char32_t ca, cb;
+        wchar_t ca, cb;
 
         i = 0;
@@ -704 +704 @@
                         /* Extend array */
                         compl_len = 2 * compl_len;
-                        char **temp = realloc(compl, compl_len * sizeof(char *));
-                        if (temp == NULL) {
-                                free(compl);
+                        compl = realloc(compl, compl_len * sizeof(char *));
+                        if (compl == NULL) {
                                 printf("Error: Out of memory.\n");
                                 break;
                         }
-                        compl = temp;
                 }