Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-12 20:01:15 +00:00
16 changed files with 122 additions and 55 deletions

View File

@ -160,14 +160,14 @@ input_key(struct window_pane *wp, key_code key, struct mouse_event *m)
* if necessary. If it is a UTF-8 key, split it and send it.
*/
justkey = (key & ~KEYC_ESCAPE);
if (key != KEYC_NONE && justkey <= 0x7f) {
if (justkey <= 0x7f) {
if (key & KEYC_ESCAPE)
bufferevent_write(wp->event, "\033", 1);
ud.data[0] = justkey;
bufferevent_write(wp->event, &ud.data[0], 1);
return;
}
if (key != KEYC_NONE && justkey > 0x7f && justkey < KEYC_BASE) {
if (justkey > 0x7f && justkey < KEYC_BASE) {
if (utf8_split(justkey, &ud) != UTF8_DONE)
return;
if (key & KEYC_ESCAPE)