===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -c -r1.296 -r1.297
*** src/usr.bin/tmux/server-client.c	2019/11/01 20:26:21	1.296
--- src/usr.bin/tmux/server-client.c	2019/11/28 09:45:16	1.297
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.296 2019/11/01 20:26:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.297 2019/11/28 09:45:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1321,1327 ****
  server_client_resize_force(struct window_pane *wp)
  {
  	struct timeval	tv = { .tv_usec = 100000 };
- 	struct winsize	ws;
  
  	/*
  	 * If we are resizing to the same size as when we entered the loop
--- 1321,1326 ----
***************
*** 1342,1353 ****
  	    wp->sy <= 1)
  		return (0);
  
- 	memset(&ws, 0, sizeof ws);
- 	ws.ws_col = wp->sx;
- 	ws.ws_row = wp->sy - 1;
- 	if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
- 		fatal("ioctl failed");
  	log_debug("%s: %%%u forcing resize", __func__, wp->id);
  
  	evtimer_add(&wp->resize_timer, &tv);
  	wp->flags |= PANE_RESIZEFORCE;
--- 1341,1348 ----
  	    wp->sy <= 1)
  		return (0);
  
  	log_debug("%s: %%%u forcing resize", __func__, wp->id);
+ 	window_pane_send_resize(wp, -1);
  
  	evtimer_add(&wp->resize_timer, &tv);
  	wp->flags |= PANE_RESIZEFORCE;
***************
*** 1358,1371 ****
  static void
  server_client_resize_pane(struct window_pane *wp)
  {
- 	struct winsize	ws;
- 
- 	memset(&ws, 0, sizeof ws);
- 	ws.ws_col = wp->sx;
- 	ws.ws_row = wp->sy;
- 	if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
- 		fatal("ioctl failed");
  	log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);
  
  	wp->flags &= ~PANE_RESIZE;
  
--- 1353,1360 ----
  static void
  server_client_resize_pane(struct window_pane *wp)
  {
  	log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);
+ 	window_pane_send_resize(wp, 0);
  
  	wp->flags &= ~PANE_RESIZE;