Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-12-09 00:01:12 +00:00
commit 75135ded09

View File

@ -63,7 +63,8 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
struct window_pane *wp = item->state.tflag.wp; struct window_pane *wp = item->state.tflag.wp;
struct session *s = item->state.tflag.s; struct session *s = item->state.tflag.s;
struct mouse_event *m = &item->mouse; struct mouse_event *m = &item->mouse;
const u_char *keystr; struct utf8_data *ud, *uc;
wchar_t wc;
int i, literal; int i, literal;
key_code key; key_code key;
u_int np = 1; u_int np = 1;
@ -124,8 +125,12 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
literal = 1; literal = 1;
} }
if (literal) { if (literal) {
for (keystr = args->argv[i]; *keystr != '\0'; keystr++) ud = utf8_fromcstr(args->argv[i]);
window_pane_key(wp, NULL, s, *keystr, NULL); for (uc = ud; uc->size != 0; uc++) {
if (utf8_combine(uc, &wc) == UTF8_DONE)
window_pane_key(wp, NULL, s, wc, NULL);
}
free(ud);
} }
} }