Changes in uspace/srv/hid/console/console.c [fafb8e5:28a5ebd] in mainline

File:

• uspace/srv/hid/console/console.c (modified) (5 diffs)

uspace/srv/hid/console/console.c

@@ -105 +105 @@
 static errno_t input_ev_active(input_t *);
 static errno_t input_ev_deactive(input_t *);
-static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
+static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
 static errno_t input_ev_move(input_t *, int, int);
 static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
@@ -250 +250 @@
 
 static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
-    keymod_t mods, wchar_t c)
+    keymod_t mods, char32_t c)
 {
         if ((key >= KC_F1) && (key <= KC_F1 + CONSOLE_COUNT) &&
@@ -293 +293 @@
 
 /** Process a character from the client (TTY emulation). */
-static void cons_write_char(console_t *cons, wchar_t ch)
+static void cons_write_char(console_t *cons, char32_t ch)
 {
         sysarg_t updated = 0;
@@ -312 +312 @@
                 break;
         default:
-                updated = chargrid_putwchar(cons->frontbuf, ch, true);
+                updated = chargrid_putuchar(cons->frontbuf, ch, true);
         }
 
@@ -371 +371 @@
                         /* Accept key presses of printable chars only. */
                         if ((event->type == KEY_PRESS) && (event->c != 0)) {
-                                wchar_t tmp[2] = { event->c, 0 };
+                                char32_t tmp[2] = { event->c, 0 };
                                 wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp);
                                 cons->char_remains_len = str_size(cons->char_remains);