From e72296758074d8e375490025b0cbe7f333230f13 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 13 Jan 2012 07:59:21 +0100 Subject: input: handle UTF-8 terminal input This assumes the terminal uses UTF-8. If invalid UTF-8 is encountered (for example because the terminal uses a legacy encoding), the code falls back to the old method and feeds each byte as key code to the input code. In theory, UTF-8 input could randomly fail, because the code in getch2.c doesn't try to fill the input buffer correctly with input sequences longer than a byte. This is a problem with the design of the existing code. --- osdep/getch2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'osdep') diff --git a/osdep/getch2.c b/osdep/getch2.c index f421bdea7e..1eb78070c0 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -57,6 +57,7 @@ #include #include +#include "bstr.h" #include "mp_fifo.h" #include "input/keycodes.h" #include "getch2.h" @@ -202,6 +203,15 @@ void getch2(struct mp_fifo *fifo) } code = KEY_ENTER; } + int utf8len = bstr_parse_utf8_code_length(code); + if (utf8len > 0 && utf8len <= getch2_len) { + struct bstr s = { getch2_buf, utf8len }; + int unicode = bstr_decode_utf8(s, NULL); + if (unicode > 0) { + len = utf8len; + code = unicode; + } + } } else if (getch2_len > 1) { int c = getch2_buf[1]; -- cgit v1.2.3