Changeset 28a5ebd in mainline for uspace/srv/hid/console/console.c
- Timestamp:
- 2020-06-18T15:39:50Z (4 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ce52c333
- Parents:
- 4f663f3e
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/console/console.c
r4f663f3e r28a5ebd 105 105 static errno_t input_ev_active(input_t *); 106 106 static errno_t input_ev_deactive(input_t *); 107 static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);107 static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t); 108 108 static errno_t input_ev_move(input_t *, int, int); 109 109 static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned); … … 250 250 251 251 static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key, 252 keymod_t mods, wchar_t c)252 keymod_t mods, char32_t c) 253 253 { 254 254 if ((key >= KC_F1) && (key <= KC_F1 + CONSOLE_COUNT) && … … 293 293 294 294 /** Process a character from the client (TTY emulation). */ 295 static void cons_write_char(console_t *cons, wchar_t ch)295 static void cons_write_char(console_t *cons, char32_t ch) 296 296 { 297 297 sysarg_t updated = 0; … … 312 312 break; 313 313 default: 314 updated = chargrid_put wchar(cons->frontbuf, ch, true);314 updated = chargrid_putuchar(cons->frontbuf, ch, true); 315 315 } 316 316 … … 371 371 /* Accept key presses of printable chars only. */ 372 372 if ((event->type == KEY_PRESS) && (event->c != 0)) { 373 wchar_t tmp[2] = { event->c, 0 };373 char32_t tmp[2] = { event->c, 0 }; 374 374 wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp); 375 375 cons->char_remains_len = str_size(cons->char_remains);
Note:
See TracChangeset
for help on using the changeset viewer.