aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-02-05 16:15:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-05 16:15:49 +0000
commit52f1f44897fa0025cc0482a5dd348c6aa0ec1a2d (patch)
tree19612f8a63c25f66baf8eacad28931f2d302765f /input.c
parentMerge branch 'config-no-null-strings-in-printf' (diff)
parentchar32: inline wcs*() wrappers (diff)
Merge branch 'fcft-3'
Diffstat (limited to 'input.c')
-rw-r--r--input.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/input.c b/input.c
index 10d36b04..68db9929 100644
--- a/input.c
+++ b/input.c
@@ -1123,16 +1123,15 @@ legacy_kbd_protocol(struct seat *seat, struct terminal *term,
}
else if (term->meta.eight_bit && count == 1) {
- const wchar_t wc = 0x80 | utf8[0];
+ const char32_t wc = 0x80 | utf8[0];
- char wc_as_utf8[8];
- mbstate_t ps = {0};
- size_t chars = wcrtomb(wc_as_utf8, wc, &ps);
+ char utf8_meta[MB_CUR_MAX];
+ size_t chars = c32rtomb(utf8_meta, wc, &(mbstate_t){0});
if (chars != (size_t)-1)
- term_to_slave(term, wc_as_utf8, chars);
+ term_to_slave(term, utf8_meta, chars);
else
- term_to_slave(term, wc_as_utf8, count);
+ term_to_slave(term, utf8, count);
}
else {
@@ -1585,8 +1584,8 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
xkb_compose_state_get_utf8(
seat->kbd.xkb_compose_state, (char *)utf8, count + 1);
- wchar_t wc;
- if (mbtowc(&wc, (const char *)utf8, count) == count)
+ char32_t wc;
+ if (mbrtoc32(&wc, (const char *)utf8, count, &(mbstate_t){0}) == count)
utf32 = wc;
} else {
xkb_state_key_get_utf8(