===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -c -r1.187 -r1.188
*** src/usr.bin/tmux/server-client.c	2016/06/16 10:55:47	1.187
--- src/usr.bin/tmux/server-client.c	2016/09/28 08:30:44	1.188
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.187 2016/06/16 10:55:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.188 2016/09/28 08:30:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 765,776 ****
  	}
  }
  
! /* Check if pane should be resized. */
! void
! server_client_check_resize(struct window_pane *wp)
  {
! 	struct winsize	ws;
  
  	if (!(wp->flags & PANE_RESIZE))
  		return;
  
--- 765,778 ----
  	}
  }
  
! static void
! server_client_resize_event(__unused int fd, __unused short events, void *data)
  {
! 	struct window_pane	*wp = data;
! 	struct winsize		 ws;
  
+ 	evtimer_del(&wp->resize_timer);
+ 
  	if (!(wp->flags & PANE_RESIZE))
  		return;
  
***************
*** 782,787 ****
--- 784,819 ----
  		fatal("ioctl failed");
  
  	wp->flags &= ~PANE_RESIZE;
+ }
+ 
+ /* Check if pane should be resized. */
+ void
+ server_client_check_resize(struct window_pane *wp)
+ {
+ 	struct timeval	 tv = { .tv_usec = 250000 };
+ 
+ 	if (!(wp->flags & PANE_RESIZE))
+ 		return;
+ 
+ 	if (!event_initialized(&wp->resize_timer))
+ 		evtimer_set(&wp->resize_timer, server_client_resize_event, wp);
+ 
+ 	/*
+ 	 * The first resize should happen immediately, so if the timer is not
+ 	 * running, do it now.
+ 	 */
+ 	if (!evtimer_pending(&wp->resize_timer, NULL))
+ 		server_client_resize_event(-1, 0, wp);
+ 
+ 	/*
+ 	 * If the pane is in the alternate screen, let the timer expire and
+ 	 * resize to give the application a chance to redraw. If not, keep
+ 	 * pushing the timer back.
+ 	 */
+ 	if (wp->saved_grid != NULL && evtimer_pending(&wp->resize_timer, NULL))
+ 		return;
+ 	evtimer_del(&wp->resize_timer);
+ 	evtimer_add(&wp->resize_timer, &tv);
  }
  
  /* Check whether pane should be focused. */