===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/tmux/cmd-copy-mode.c	2016/10/16 17:55:14	1.30
--- src/usr.bin/tmux/cmd-copy-mode.c	2016/10/16 19:04:05	1.31
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.30 2016/10/16 17:55:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-copy-mode.c,v 1.31 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 24,30 ****
   * Enter copy or clock mode.
   */
  
! static enum cmd_retval	 cmd_copy_mode_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_copy_mode_entry = {
  	.name = "copy-mode",
--- 24,30 ----
   * Enter copy or clock mode.
   */
  
! static enum cmd_retval	cmd_copy_mode_exec(struct cmd *, struct cmdq_item *);
  
  const struct cmd_entry cmd_copy_mode_entry = {
  	.name = "copy-mode",
***************
*** 53,67 ****
  };
  
  static enum cmd_retval
! cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct client		*c = cmdq->client;
  	struct session		*s;
! 	struct window_pane	*wp = cmdq->state.tflag.wp;
  
  	if (args_has(args, 'M')) {
! 		if ((wp = cmd_mouse_pane(&cmdq->mouse, &s, NULL)) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
--- 53,67 ----
  };
  
  static enum cmd_retval
! cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = self->args;
! 	struct client		*c = item->client;
  	struct session		*s;
! 	struct window_pane	*wp = item->state.tflag.wp;
  
  	if (args_has(args, 'M')) {
! 		if ((wp = cmd_mouse_pane(&item->mouse, &s, NULL)) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
***************
*** 80,86 ****
  	if (args_has(args, 'M')) {
  		if (wp->mode != NULL && wp->mode != &window_copy_mode)
  			return (CMD_RETURN_NORMAL);
! 		window_copy_start_drag(c, &cmdq->mouse);
  	}
  	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
  		window_copy_pageup(wp, 0);
--- 80,86 ----
  	if (args_has(args, 'M')) {
  		if (wp->mode != NULL && wp->mode != &window_copy_mode)
  			return (CMD_RETURN_NORMAL);
! 		window_copy_start_drag(c, &item->mouse);
  	}
  	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
  		window_copy_pageup(wp, 0);