===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-send-keys.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/tmux/cmd-send-keys.c	2020/04/13 08:26:27	1.55
--- src/usr.bin/tmux/cmd-send-keys.c	2020/04/13 10:59:58	1.56
***************
*** 1,4 ****
! /* $OpenBSD: cmd-send-keys.c,v 1.55 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-send-keys.c,v 1.56 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 60,65 ****
--- 60,66 ----
  cmd_send_keys_inject_key(struct client *c, struct cmd_find_state *fs,
      struct cmdq_item *item, key_code key)
  {
+ 	struct cmd_find_state		*target = cmdq_get_target(item);
  	struct session			*s = fs->s;
  	struct winlink			*wl = fs->wl;
  	struct window_pane		*wp = fs->wp;
***************
*** 71,77 ****
  	if (wme == NULL || wme->mode->key_table == NULL) {
  		if (options_get_number(fs->wp->window->options, "xterm-keys"))
  			key |= KEYC_XTERM;
! 		if (window_pane_key(wp, item->client, s, wl, key, NULL) != 0)
  			return (NULL);
  		return (item);
  	}
--- 72,79 ----
  	if (wme == NULL || wme->mode->key_table == NULL) {
  		if (options_get_number(fs->wp->window->options, "xterm-keys"))
  			key |= KEYC_XTERM;
! 		if (window_pane_key(wp, cmdq_get_client(item), s, wl, key,
! 		    NULL) != 0)
  			return (NULL);
  		return (item);
  	}
***************
*** 80,86 ****
  	bd = key_bindings_get(table, key & ~KEYC_XTERM);
  	if (bd != NULL) {
  		table->references++;
! 		item = key_bindings_dispatch(bd, item, c, NULL, &item->target);
  		key_bindings_unref_table(table);
  	}
  	return (item);
--- 82,88 ----
  	bd = key_bindings_get(table, key & ~KEYC_XTERM);
  	if (bd != NULL) {
  		table->references++;
! 		item = key_bindings_dispatch(bd, item, c, NULL, target);
  		key_bindings_unref_table(table);
  	}
  	return (item);
***************
*** 132,143 ****
  cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args			*args = cmd_get_args(self);
  	struct client			*c = cmd_find_client(item, NULL, 1);
! 	struct cmd_find_state		*fs = &item->target;
! 	struct window_pane		*wp = item->target.wp;
! 	struct session			*s = item->target.s;
! 	struct winlink			*wl = item->target.wl;
! 	struct mouse_event		*m = &item->shared->mouse;
  	struct window_mode_entry	*wme = TAILQ_FIRST(&wp->modes);
  	int				 i;
  	key_code			 key;
--- 134,146 ----
  cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args			*args = cmd_get_args(self);
+ 	struct cmdq_shared		*shared = cmdq_get_shared(item);
+ 	struct cmd_find_state		*target = cmdq_get_target(item);
  	struct client			*c = cmd_find_client(item, NULL, 1);
! 	struct window_pane		*wp = target->wp;
! 	struct session			*s = target->s;
! 	struct winlink			*wl = target->wl;
! 	struct mouse_event		*m = &shared->mouse;
  	struct window_mode_entry	*wme = TAILQ_FIRST(&wp->modes);
  	int				 i;
  	key_code			 key;
***************
*** 177,183 ****
  			cmdq_error(item, "no mouse target");
  			return (CMD_RETURN_ERROR);
  		}
! 		window_pane_key(wp, item->client, s, wl, m->key, m);
  		return (CMD_RETURN_NORMAL);
  	}
  
--- 180,186 ----
  			cmdq_error(item, "no mouse target");
  			return (CMD_RETURN_ERROR);
  		}
! 		window_pane_key(wp, cmdq_get_client(item), s, wl, m->key, m);
  		return (CMD_RETURN_NORMAL);
  	}
  
***************
*** 186,192 ****
  			key = options_get_number(s->options, "prefix2");
  		else
  			key = options_get_number(s->options, "prefix");
! 		cmd_send_keys_inject_key(c, fs, item, key);
  		return (CMD_RETURN_NORMAL);
  	}
  
--- 189,195 ----
  			key = options_get_number(s->options, "prefix2");
  		else
  			key = options_get_number(s->options, "prefix");
! 		cmd_send_keys_inject_key(c, target, item, key);
  		return (CMD_RETURN_NORMAL);
  	}
  
***************
*** 196,203 ****
  	}
  
  	for (; np != 0; np--) {
! 		for (i = 0; i < args->argc; i++)
! 			item = cmd_send_keys_inject_string(c, fs, item, args, i);
  	}
  
  	return (CMD_RETURN_NORMAL);
--- 199,208 ----
  	}
  
  	for (; np != 0; np--) {
! 		for (i = 0; i < args->argc; i++) {
! 			item = cmd_send_keys_inject_string(c, target, item,
! 			    args, i);
! 		}
  	}
  
  	return (CMD_RETURN_NORMAL);