diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-05-26 08:42:55 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-05-26 08:42:55 +0100 |
| commit | 967e5f8be3d89c6b604484d3b7b2a1ff25db06a5 (patch) | |
| tree | abdf31d46ae31d0bf7b705454e7bf86ccebc06b9 /tty-keys.c | |
| parent | fd4d3e87938206d8d05509162c3f3a3c274bb478 (diff) | |
| parent | 6f03e49e68dfe0d9c0c7d49079c4383b26aca916 (diff) | |
| download | rtmux-967e5f8be3d89c6b604484d3b7b2a1ff25db06a5.tar.gz rtmux-967e5f8be3d89c6b604484d3b7b2a1ff25db06a5.tar.bz2 rtmux-967e5f8be3d89c6b604484d3b7b2a1ff25db06a5.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty-keys.c')
| -rw-r--r-- | tty-keys.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -578,8 +578,8 @@ tty_keys_next1(struct tty *tty, const char *buf, size_t len, key_code *key, struct tty_key *tk, *tk1; struct utf8_data ud; enum utf8_state more; + utf8_char uc; u_int i; - wchar_t wc; log_debug("%s: next key is %zu (%.*s) (expired=%d)", c->name, len, (int)len, buf, expired); @@ -611,12 +611,12 @@ tty_keys_next1(struct tty *tty, const char *buf, size_t len, key_code *key, if (more != UTF8_DONE) return (-1); - if (utf8_combine(&ud, &wc) != UTF8_DONE) + if (utf8_from_data(&ud, &uc) != UTF8_DONE) return (-1); - *key = wc; + *key = uc; log_debug("%s: UTF-8 key %.*s %#llx", c->name, (int)ud.size, - buf, *key); + ud.data, *key); return (0); } |