Changeset 28a5ebd in mainline for uspace/app/edit/edit.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/app/edit/edit.c
r4f663f3e r28a5ebd 147 147 static void pane_caret_display(void); 148 148 149 static void insert_char( wchar_t c);149 static void insert_char(char32_t c); 150 150 static void delete_char_before(void); 151 151 static void delete_char_after(void); … … 630 630 kbd_event_t *kev; 631 631 char *str; 632 wchar_t buffer[INFNAME_MAX_LEN + 1];632 char32_t buffer[INFNAME_MAX_LEN + 1]; 633 633 int max_len; 634 634 int nc; … … 670 670 default: 671 671 if (kev->c >= 32 && nc < max_len) { 672 put wchar(kev->c);672 putuchar(kev->c); 673 673 console_flush(con); 674 674 buffer[nc++] = kev->c; … … 696 696 { 697 697 FILE *f; 698 wchar_t c;698 char32_t c; 699 699 char buf[BUF_SIZE]; 700 700 int bcnt; … … 850 850 coord_t rbc, rec; 851 851 char row_buf[ROW_BUF_SIZE]; 852 wchar_t c;852 char32_t c; 853 853 size_t pos, size; 854 854 int s_column; … … 1055 1055 1056 1056 /** Insert a character at caret position. */ 1057 static void insert_char( wchar_t c)1057 static void insert_char(char32_t c) 1058 1058 { 1059 1059 spt_t pt; … … 1285 1285 1286 1286 /* Search operations */ 1287 static errno_t search_spt_producer(void *data, wchar_t *ret)1287 static errno_t search_spt_producer(void *data, char32_t *ret) 1288 1288 { 1289 1289 assert(data != NULL); … … 1294 1294 } 1295 1295 1296 static errno_t search_spt_reverse_producer(void *data, wchar_t *ret)1296 static errno_t search_spt_reverse_producer(void *data, char32_t *ret) 1297 1297 { 1298 1298 assert(data != NULL); … … 1513 1513 char *str; 1514 1514 size_t off; 1515 wchar_t c;1515 char32_t c; 1516 1516 errno_t rc; 1517 1517 … … 1609 1609 } 1610 1610 1611 static wchar_t get_first_wchar(const char *str)1611 static char32_t get_first_wchar(const char *str) 1612 1612 { 1613 1613 size_t offset = 0; … … 1630 1630 return false; 1631 1631 1632 wchar_t first_char = get_first_wchar(ch);1632 char32_t first_char = get_first_wchar(ch); 1633 1633 switch (first_char) { 1634 1634 case ' ': … … 1656 1656 return false; 1657 1657 1658 wchar_t first_char = get_first_wchar(ch);1658 char32_t first_char = get_first_wchar(ch); 1659 1659 switch (first_char) { 1660 1660 case ',':
Note:
See TracChangeset
for help on using the changeset viewer.