===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -c -r1.91 -r1.92
*** src/usr.bin/tmux/cmd-queue.c	2020/04/23 05:48:42	1.91
--- src/usr.bin/tmux/cmd-queue.c	2020/05/16 15:40:04	1.92
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.91 2020/04/23 05:48:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.92 2020/05/16 15:40:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 341,349 ****
      struct cmd_find_state *current, const char *fmt, ...)
  {
  	struct cmdq_state		*state = item->state;
  	struct options			*oo;
  	va_list				 ap;
! 	char				*name;
  	struct cmdq_item		*new_item;
  	struct cmdq_state		*new_state;
  	struct options_entry		*o;
--- 341,355 ----
      struct cmd_find_state *current, const char *fmt, ...)
  {
  	struct cmdq_state		*state = item->state;
+ 	struct cmd			*cmd = item->cmd;
+ 	struct args			*args = cmd_get_args(cmd);
+ 	struct args_entry		*entryp;
+ 	struct args_value		*valuep;
  	struct options			*oo;
  	va_list				 ap;
! 	char				*name, tmp[32], flag, *arguments;
! 	int				 i;
! 	const char			*value;
  	struct cmdq_item		*new_item;
  	struct cmdq_state		*new_state;
  	struct options_entry		*o;
***************
*** 374,379 ****
--- 380,416 ----
  	 */
  	new_state = cmdq_new_state(current, &state->event, CMDQ_STATE_NOHOOKS);
  	cmdq_add_format(new_state, "hook", "%s", name);
+ 
+ 	arguments = args_print(args);
+ 	cmdq_add_format(new_state, "hook_arguments", "%s", arguments);
+ 	free(arguments);
+ 
+ 	for (i = 0; i < args->argc; i++) {
+ 		xsnprintf(tmp, sizeof tmp, "hook_argument_%d", i);
+ 		cmdq_add_format(new_state, tmp, "%s", args->argv[i]);
+ 	}
+ 	flag = args_first(args, &entryp);
+ 	while (flag != 0) {
+ 		value = args_get(args, flag);
+ 		if (value == NULL) {
+ 			xsnprintf(tmp, sizeof tmp, "hook_flag_%c", flag);
+ 			cmdq_add_format(new_state, tmp, "1");
+ 		} else {
+ 			xsnprintf(tmp, sizeof tmp, "hook_flag_%c", flag);
+ 			cmdq_add_format(new_state, tmp, "%s", value);
+ 		}
+ 
+ 		i = 0;
+ 		value = args_first_value(args, flag, &valuep);
+ 		while (value != NULL) {
+ 			xsnprintf(tmp, sizeof tmp, "hook_flag_%c_%d", flag, i);
+ 			cmdq_add_format(new_state, tmp, "%s", value);
+ 			i++;
+ 			value = args_next_value(&valuep);
+ 		}
+ 
+ 		flag = args_next(&entryp);
+ 	}
  
  	a = options_array_first(o);
  	while (a != NULL) {