===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-panes.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/cmd-display-panes.c	2017/04/22 10:22:39	1.19
--- src/usr.bin/tmux/cmd-display-panes.c	2017/08/16 12:12:54	1.20
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-panes.c,v 1.19 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-display-panes.c,v 1.20 2017/08/16 12:12:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 37,44 ****
  	.name = "display-panes",
  	.alias = "displayp",
  
! 	.args = { "t:", 0, 1 },
! 	.usage = CMD_TARGET_CLIENT_USAGE,
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_display_panes_exec
--- 37,44 ----
  	.name = "display-panes",
  	.alias = "displayp",
  
! 	.args = { "d:t:", 0, 1 },
! 	.usage = "[-d duration] " CMD_TARGET_CLIENT_USAGE,
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_display_panes_exec
***************
*** 49,54 ****
--- 49,57 ----
  {
  	struct args	*args = self->args;
  	struct client	*c;
+ 	struct session	*s;
+ 	u_int		 delay;
+ 	char		*cause;
  
  	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
  		return (CMD_RETURN_ERROR);
***************
*** 61,68 ****
  		c->identify_callback_data = xstrdup(args->argv[0]);
  	else
  		c->identify_callback_data = xstrdup("select-pane -t '%%'");
  
! 	server_client_set_identify(c);
  
  	return (CMD_RETURN_NORMAL);
  }
--- 64,81 ----
  		c->identify_callback_data = xstrdup(args->argv[0]);
  	else
  		c->identify_callback_data = xstrdup("select-pane -t '%%'");
+ 	s = c->session;
  
! 	if (args_has(args, 'd')) {
! 		delay = args_strtonum(args, 'd', 0, UINT_MAX, &cause);
! 		if (cause != NULL) {
! 			cmdq_error(item, "delay %s", cause);
! 			free(cause);
! 			return (CMD_RETURN_ERROR);
! 		}
! 	} else
! 		delay = options_get_number(s->options, "display-panes-time");
! 	server_client_set_identify(c, delay);
  
  	return (CMD_RETURN_NORMAL);
  }