===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-resize-pane.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** src/usr.bin/tmux/cmd-resize-pane.c	2016/10/16 17:55:14	1.27
--- src/usr.bin/tmux/cmd-resize-pane.c	2016/10/16 19:04:05	1.28
***************
*** 1,4 ****
! /* $OpenBSD: cmd-resize-pane.c,v 1.27 2016/10/16 17:55:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-resize-pane.c,v 1.28 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 26,32 ****
   * Increase or decrease pane size.
   */
  
! static enum cmd_retval	 cmd_resize_pane_exec(struct cmd *, struct cmd_q *);
  
  static void	cmd_resize_pane_mouse_update(struct client *,
  		    struct mouse_event *);
--- 26,32 ----
   * Increase or decrease pane size.
   */
  
! static enum cmd_retval	cmd_resize_pane_exec(struct cmd *, struct cmdq_item *);
  
  static void	cmd_resize_pane_mouse_update(struct client *,
  		    struct mouse_event *);
***************
*** 46,71 ****
  };
  
  static enum cmd_retval
! cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct window_pane	*wp = cmdq->state.tflag.wp;
! 	struct winlink		*wl = cmdq->state.tflag.wl;
  	struct window		*w = wl->window;
! 	struct client		*c = cmdq->client;
! 	struct session		*s = cmdq->state.tflag.s;
  	const char	       	*errstr;
  	char			*cause;
  	u_int			 adjust;
  	int			 x, y;
  
  	if (args_has(args, 'M')) {
! 		if (cmd_mouse_window(&cmdq->mouse, &s) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
  		c->tty.mouse_drag_update = cmd_resize_pane_mouse_update;
! 		cmd_resize_pane_mouse_update(c, &cmdq->mouse);
  		return (CMD_RETURN_NORMAL);
  	}
  
--- 46,71 ----
  };
  
  static enum cmd_retval
! cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = self->args;
! 	struct window_pane	*wp = item->state.tflag.wp;
! 	struct winlink		*wl = item->state.tflag.wl;
  	struct window		*w = wl->window;
! 	struct client		*c = item->client;
! 	struct session		*s = item->state.tflag.s;
  	const char	       	*errstr;
  	char			*cause;
  	u_int			 adjust;
  	int			 x, y;
  
  	if (args_has(args, 'M')) {
! 		if (cmd_mouse_window(&item->mouse, &s) == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (c == NULL || c->session != s)
  			return (CMD_RETURN_NORMAL);
  		c->tty.mouse_drag_update = cmd_resize_pane_mouse_update;
! 		cmd_resize_pane_mouse_update(c, &item->mouse);
  		return (CMD_RETURN_NORMAL);
  	}
  
***************
*** 85,91 ****
  	else {
  		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
  		if (errstr != NULL) {
! 			cmdq_error(cmdq, "adjustment %s", errstr);
  			return (CMD_RETURN_ERROR);
  		}
  	}
--- 85,91 ----
  	else {
  		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
  		if (errstr != NULL) {
! 			cmdq_error(item, "adjustment %s", errstr);
  			return (CMD_RETURN_ERROR);
  		}
  	}
***************
*** 94,100 ****
  		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(cmdq, "width %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
--- 94,100 ----
  		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(item, "width %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
***************
*** 104,110 ****
  		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(cmdq, "height %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
--- 104,110 ----
  		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(item, "height %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}