===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/resize.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/tmux/resize.c	2019/09/19 09:02:30	1.33
--- src/usr.bin/tmux/resize.c	2019/09/23 15:41:11	1.34
***************
*** 1,4 ****
! /* $OpenBSD: resize.c,v 1.33 2019/09/19 09:02:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: resize.c,v 1.34 2019/09/23 15:41:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 76,105 ****
  }
  
  void
! default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
!     int type)
  {
! 	struct client	*c;
  	u_int		 cx, cy;
  	const char	*value;
  
  	if (type == -1)
  		type = options_get_number(global_w_options, "window-size");
! 	if (type == WINDOW_SIZE_MANUAL)
! 		goto manual;
! 
! 	if (type == WINDOW_SIZE_LARGEST) {
  		*sx = *sy = 0;
! 		TAILQ_FOREACH(c, &clients, entry) {
! 			if (ignore_client_size(c))
  				continue;
! 			if (w != NULL && !session_has(c->session, w))
  				continue;
! 			if (w == NULL && c->session != s)
  				continue;
  
! 			cx = c->tty.sx;
! 			cy = c->tty.sy - status_line_size(c);
  
  			if (cx > *sx)
  				*sx = cx;
--- 76,103 ----
  }
  
  void
! default_window_size(struct client *c, struct session *s, struct window *w,
!     u_int *sx, u_int *sy, int type)
  {
! 	struct client	*loop;
  	u_int		 cx, cy;
  	const char	*value;
  
  	if (type == -1)
  		type = options_get_number(global_w_options, "window-size");
! 	switch (type) {
! 	case WINDOW_SIZE_LARGEST:
  		*sx = *sy = 0;
! 		TAILQ_FOREACH(loop, &clients, entry) {
! 			if (ignore_client_size(loop))
  				continue;
! 			if (w != NULL && !session_has(loop->session, w))
  				continue;
! 			if (w == NULL && loop->session != s)
  				continue;
  
! 			cx = loop->tty.sx;
! 			cy = loop->tty.sy - status_line_size(loop);
  
  			if (cx > *sx)
  				*sx = cx;
***************
*** 108,125 ****
  		}
  		if (*sx == 0 || *sy == 0)
  			goto manual;
! 	} else {
  		*sx = *sy = UINT_MAX;
! 		TAILQ_FOREACH(c, &clients, entry) {
! 			if (ignore_client_size(c))
  				continue;
! 			if (w != NULL && !session_has(c->session, w))
  				continue;
! 			if (w == NULL && c->session != s)
  				continue;
  
! 			cx = c->tty.sx;
! 			cy = c->tty.sy - status_line_size(c);
  
  			if (cx < *sx)
  				*sx = cx;
--- 106,124 ----
  		}
  		if (*sx == 0 || *sy == 0)
  			goto manual;
! 		break;
! 	case WINDOW_SIZE_SMALLEST:
  		*sx = *sy = UINT_MAX;
! 		TAILQ_FOREACH(loop, &clients, entry) {
! 			if (ignore_client_size(loop))
  				continue;
! 			if (w != NULL && !session_has(loop->session, w))
  				continue;
! 			if (w == NULL && loop->session != s)
  				continue;
  
! 			cx = loop->tty.sx;
! 			cy = loop->tty.sy - status_line_size(loop);
  
  			if (cx < *sx)
  				*sx = cx;
***************
*** 128,133 ****
--- 127,160 ----
  		}
  		if (*sx == UINT_MAX || *sy == UINT_MAX)
  			goto manual;
+ 		break;
+ 	case WINDOW_SIZE_LATEST:
+ 		if (c != NULL && !ignore_client_size(c)) {
+ 			*sx = c->tty.sx;
+ 			*sy = c->tty.sy - status_line_size(c);
+ 		} else {
+ 			*sx = *sy = UINT_MAX;
+ 			TAILQ_FOREACH(loop, &clients, entry) {
+ 				if (ignore_client_size(loop))
+ 					continue;
+ 				if (w != NULL && loop != w->latest)
+ 					continue;
+ 				s = loop->session;
+ 
+ 				cx = loop->tty.sx;
+ 				cy = loop->tty.sy - status_line_size(loop);
+ 
+ 				if (cx < *sx)
+ 					*sx = cx;
+ 				if (cy < *sy)
+ 					*sy = cy;
+ 			}
+ 			if (*sx == UINT_MAX || *sy == UINT_MAX)
+ 				goto manual;
+ 		}
+ 		break;
+ 	case WINDOW_SIZE_MANUAL:
+ 		goto manual;
  	}
  	goto done;