diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
| commit | 3ec05e940505f1d0b4e55413f949fdfaceddedde (patch) | |
| tree | 843d754e76bb7386f39cb5743ab8de859e880ddd /cmd-send-keys.c | |
| parent | f8a30e158821876e8c30d46ab2728bce739e35de (diff) | |
| parent | 3f6bfbaf2babcc7f08f628a82ff31b0b52014e58 (diff) | |
| download | rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.gz rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.bz2 rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-send-keys.c')
| -rw-r--r-- | cmd-send-keys.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmd-send-keys.c b/cmd-send-keys.c index 80799c54..d9c39f63 100644 --- a/cmd-send-keys.c +++ b/cmd-send-keys.c @@ -61,10 +61,11 @@ cmd_send_keys_inject(struct client *c, struct cmdq_item *item, key_code key) struct window_pane *wp = item->target.wp; struct session *s = item->target.s; struct winlink *wl = item->target.wl; - struct window_mode_entry *wme = wp->mode; + struct window_mode_entry *wme; struct key_table *table; struct key_binding *bd; + wme = TAILQ_FIRST(&wp->modes); if (wme == NULL || wme->mode->key_table == NULL) { if (options_get_number(wp->window->options, "xterm-keys")) key |= KEYC_XTERM; @@ -90,7 +91,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item) struct session *s = item->target.s; struct winlink *wl = item->target.wl; struct mouse_event *m = &item->shared->mouse; - struct window_mode_entry *wme = wp->mode; + struct window_mode_entry *wme = TAILQ_FIRST(&wp->modes); struct utf8_data *ud, *uc; wchar_t wc; int i, literal; @@ -105,8 +106,13 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item) free(cause); return (CMD_RETURN_ERROR); } - if (wme != NULL && (args_has(args, 'X') || args->argc == 0)) + if (wme != NULL && (args_has(args, 'X') || args->argc == 0)) { + if (wme == NULL || wme->mode->command == NULL) { + cmdq_error(item, "not in a mode"); + return (CMD_RETURN_ERROR); + } wme->prefix = np; + } } if (args_has(args, 'X')) { |