===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/tmux/screen-write.c	2017/10/05 08:12:24	1.131
--- src/usr.bin/tmux/screen-write.c	2017/11/02 21:29:17	1.132
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.131 2017/10/05 08:12:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.132 2017/11/02 21:29:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 351,361 ****
  	free(msg);
  }
  
! /* Copy from another screen. */
  void
  screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
!     u_int py, u_int nx, u_int ny, bitstr_t *markbs,
!     const struct grid_cell *markgc)
  {
  	struct screen		*s = ctx->s;
  	struct grid		*gd = src->grid;
--- 351,360 ----
  	free(msg);
  }
  
! /* Copy from another screen. Assumes target region is big enough. */
  void
  screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
!     u_int py, u_int nx, u_int ny, bitstr_t *mbs, const struct grid_cell *mgc)
  {
  	struct screen		*s = ctx->s;
  	struct grid		*gd = src->grid;
***************
*** 371,392 ****
  	for (yy = py; yy < py + ny; yy++) {
  		for (xx = px; xx < px + nx; xx++) {
  			grid_get_cell(gd, xx, yy, &gc);
! 			if (markbs != NULL) {
  				b = (yy * screen_size_x(src)) + xx;
! 				if (bit_test(markbs, b)) {
! 					gc.attr = markgc->attr;
! 					gc.fg = markgc->fg;
! 					gc.bg = markgc->bg;
  				}
  			}
  			screen_write_cell(ctx, &gc);
  		}
- 
  		cy++;
  		screen_write_cursormove(ctx, cx, cy);
  	}
  }
  
  /* Draw a horizontal line on screen. */
  void
  screen_write_hline(struct screen_write_ctx *ctx, u_int nx, int left, int right)
--- 370,421 ----
  	for (yy = py; yy < py + ny; yy++) {
  		for (xx = px; xx < px + nx; xx++) {
  			grid_get_cell(gd, xx, yy, &gc);
! 			if (mbs != NULL) {
  				b = (yy * screen_size_x(src)) + xx;
! 				if (bit_test(mbs, b)) {
! 					gc.attr = mgc->attr;
! 					gc.fg = mgc->fg;
! 					gc.bg = mgc->bg;
  				}
  			}
  			screen_write_cell(ctx, &gc);
  		}
  		cy++;
  		screen_write_cursormove(ctx, cx, cy);
  	}
  }
  
+ /*
+  * Copy from another screen but without the selection stuff. Also assumes the
+  * target region is already big enough and already cleared.
+  */
+ void
+ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
+     u_int px, u_int py, u_int nx, u_int ny)
+ {
+ 	struct screen		*s = ctx->s;
+ 	struct grid		*gd = src->grid;
+ 	struct grid_cell	 gc;
+ 	u_int		 	 xx, yy, cx, cy;
+ 
+ 	if (nx == 0 || ny == 0)
+ 		return;
+ 
+ 	cy = s->cy;
+ 	for (yy = py; yy < py + ny; yy++) {
+ 		cx = s->cx;
+ 		for (xx = px; xx < px + nx; xx++) {
+ 			if (xx >= gd->linedata[yy].cellsize)
+ 				break;
+ 			grid_get_cell(gd, xx, yy, &gc);
+ 			if (!grid_cells_equal(&gc, &grid_default_cell))
+ 				grid_view_set_cell(ctx->s->grid, cx, cy, &gc);
+ 			cx++;
+ 		}
+ 		cy++;
+ 	}
+ }
+ 
  /* Draw a horizontal line on screen. */
  void
  screen_write_hline(struct screen_write_ctx *ctx, u_int nx, int left, int right)
***************
*** 471,477 ****
  	screen_write_cursormove(ctx, cx, cy);
  }
  
! /* Write a preview version of a window. */
  void
  screen_write_preview(struct screen_write_ctx *ctx, struct screen *src, u_int nx,
      u_int ny)
--- 500,509 ----
  	screen_write_cursormove(ctx, cx, cy);
  }
  
! /*
!  * Write a preview version of a window. Assumes target area is big enough and
!  * already cleared.
!  */
  void
  screen_write_preview(struct screen_write_ctx *ctx, struct screen *src, u_int nx,
      u_int ny)
***************
*** 515,522 ****
  		py = 0;
  	}
  
! 	screen_write_copy(ctx, src, px, src->grid->hsize + py, nx, ny, NULL,
! 	    NULL);
  
  	if (src->mode & MODE_CURSOR) {
  		grid_view_get_cell(src->grid, src->cx, src->cy, &gc);
--- 547,553 ----
  		py = 0;
  	}
  
! 	screen_write_fast_copy(ctx, src, px, src->grid->hsize + py, nx, ny);
  
  	if (src->mode & MODE_CURSOR) {
  		grid_view_get_cell(src->grid, src->cx, src->cy, &gc);