===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.311
retrieving revision 1.312
diff -c -r1.311 -r1.312
*** src/usr.bin/tmux/window-copy.c	2021/01/18 11:14:24	1.311
--- src/usr.bin/tmux/window-copy.c	2021/01/22 10:21:24	1.312
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.311 2021/01/18 11:14:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.312 2021/01/22 10:21:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 3981,3991 ****
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, yy, ny, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py = hsize + data->cy - data->oy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	grid_reader_cursor_start_of_line(&gr, 1);
--- 3981,3992 ----
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, oldy, yy, ny, nd, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py = hsize + data->cy - data->oy;
+ 	oldy = data->cy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	grid_reader_cursor_start_of_line(&gr, 1);
***************
*** 3996,4004 ****
--- 3997,4007 ----
  	if (py < yy) {
  		ny = yy - py;
  		cy = 0;
+ 		nd = 1;
  	} else {
  		ny = 0;
  		cy = py - yy;
+ 		nd = oldy - cy + 1;
  	}
  	while (ny > 0) {
  		window_copy_cursor_up(wme, 1);
***************
*** 4006,4012 ****
  	}
  	window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, 1);
  }
  
  static void
--- 4009,4015 ----
  	}
  	window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, nd);
  }
  
  static void
***************
*** 4038,4048 ****
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, yy, ny, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py =  hsize + data->cy - data->oy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	if (data->screen.sel != NULL && data->rectflag)
--- 4041,4052 ----
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, oldy, yy, ny, nd, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py =  hsize + data->cy - data->oy;
+ 	oldy = data->cy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	if (data->screen.sel != NULL && data->rectflag)
***************
*** 4054,4063 ****
  	/* Scroll down if we went off the visible screen. */
  	cy = py - hsize + data->oy;
  	yy = screen_size_y(back_s) - 1;
! 	if (cy > yy)
  		ny = cy - yy;
! 	else
  		ny = 0;
  	while (ny > 0) {
  	  window_copy_cursor_down(wme, 1);
  	  ny--;
--- 4058,4071 ----
  	/* Scroll down if we went off the visible screen. */
  	cy = py - hsize + data->oy;
  	yy = screen_size_y(back_s) - 1;
! 	if (cy > yy) {
  		ny = cy - yy;
! 		oldy = yy;
! 		nd = 1;
! 	} else {
  		ny = 0;
+ 		nd = cy - oldy + 1;
+ 	}
  	while (ny > 0) {
  	  window_copy_cursor_down(wme, 1);
  	  ny--;
***************
*** 4067,4073 ****
  	else
  		window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, 1);
  }
  
  static void
--- 4075,4081 ----
  	else
  		window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, oldy, nd);
  }
  
  static void
***************
*** 4433,4473 ****
  {
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
! 	u_int				 px, py, xx, yy;
! 	int				 expected = 0;
  
  	px = data->cx;
! 	py = screen_hsize(back_s) + data->cy - data->oy;
! 	xx = window_copy_find_length(wme, py);
! 	yy = screen_hsize(back_s) + screen_size_y(back_s) - 1;
  
! 	/*
! 	 * First skip past any nonword characters and then any word characters.
! 	 *
! 	 * expected is initially set to 0 for the former and then 1 for the
! 	 * latter.
! 	 */
! 	do {
! 		while (px > xx ||
! 		    window_copy_in_set(wme, px, py, separators) == expected) {
! 			/* Move down if we're past the end of the line. */
! 			if (px > xx) {
! 				if (py == yy)
! 					return;
! 				window_copy_cursor_down(wme, 0);
! 				px = 0;
  
! 				py = screen_hsize(back_s) + data->cy - data->oy;
! 				xx = window_copy_find_length(wme, py);
! 			} else
! 				px++;
! 		}
! 		expected = !expected;
! 	} while (expected == 1);
! 
! 	window_copy_update_cursor(wme, px, data->cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, 1);
  }
  
  static void
--- 4441,4479 ----
  {
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
! 	struct grid_reader		 gr;
! 	u_int				 px, py, cy, oldy, yy, ny, nd, hsize;
  
  	px = data->cx;
! 	hsize = screen_hsize(back_s);
! 	py =  hsize + data->cy - data->oy;
! 	oldy = data->cy;
  
! 	grid_reader_start(&gr, back_s->grid, px, py);
! 	grid_reader_cursor_next_word(&gr, separators);
! 	grid_reader_get_cursor(&gr, &px, &py);
  
! 	/* Scroll down if we went off the visible screen. */
! 	cy = py - hsize + data->oy;
! 	yy = screen_size_y(back_s) - 1;
! 	if (cy > yy) {
! 		ny = cy - yy;
! 		oldy = yy;
! 		nd = 1;
! 	} else {
! 		ny = 0;
! 		nd = cy - oldy + 1;
! 	}
! 	while (ny > 0) {
! 	  window_copy_cursor_down(wme, 1);
! 	  ny--;
! 	}
! 	if (cy > yy)
! 		window_copy_update_cursor(wme, px, yy);
! 	else
! 		window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, oldy, nd);
  }
  
  static void
***************
*** 4528,4539 ****
  	struct options			*oo = wp->window->options;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, yy, ny, hsize;
  	int				 keys;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py =  hsize + data->cy - data->oy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	keys = options_get_number(oo, "mode-keys");
--- 4534,4546 ----
  	struct options			*oo = wp->window->options;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, oldy, yy, ny, nd, hsize;
  	int				 keys;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py =  hsize + data->cy - data->oy;
+ 	oldy = data->cy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	keys = options_get_number(oo, "mode-keys");
***************
*** 4547,4556 ****
  	/* Scroll down if we went off the visible screen. */
  	cy = py - hsize + data->oy;
  	yy = screen_size_y(back_s) - 1;
! 	if (cy > yy)
  		ny = cy - yy;
! 	else
  		ny = 0;
  	while (ny > 0) {
  	  window_copy_cursor_down(wme, 1);
  	  ny--;
--- 4554,4567 ----
  	/* Scroll down if we went off the visible screen. */
  	cy = py - hsize + data->oy;
  	yy = screen_size_y(back_s) - 1;
! 	if (cy > yy) {
  		ny = cy - yy;
! 		oldy = yy;
! 		nd = 1;
! 	} else {
  		ny = 0;
+ 		nd = cy - oldy + 1;
+ 	}
  	while (ny > 0) {
  	  window_copy_cursor_down(wme, 1);
  	  ny--;
***************
*** 4560,4566 ****
  	else
  		window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, no_reset))
! 		window_copy_redraw_lines(wme, data->cy, 1);
  }
  
  /* Compute the previous place where a word begins. */
--- 4571,4577 ----
  	else
  		window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, no_reset))
! 		window_copy_redraw_lines(wme, oldy, nd);
  }
  
  /* Compute the previous place where a word begins. */
***************
*** 4617,4627 ****
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, yy, ny, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py = hsize + data->cy - data->oy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	grid_reader_cursor_previous_word(&gr, separators, already);
--- 4628,4639 ----
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*back_s = data->backing;
  	struct grid_reader		 gr;
! 	u_int				 px, py, cy, oldy, yy, ny, nd, hsize;
  
  	px = data->cx;
  	hsize = screen_hsize(back_s);
  	py = hsize + data->cy - data->oy;
+ 	oldy = data->cy;
  
  	grid_reader_start(&gr, back_s->grid, px, py);
  	grid_reader_cursor_previous_word(&gr, separators, already);
***************
*** 4632,4640 ****
--- 4644,4654 ----
  	if (py < yy) {
  		ny = yy - py;
  		cy = 0;
+ 		nd = 1;
  	} else {
  		ny = 0;
  		cy = py - yy;
+ 		nd = oldy - cy + 1;
  	}
  	while (ny > 0) {
  		window_copy_cursor_up(wme, 1);
***************
*** 4642,4648 ****
  	}
  	window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, 1);
  }
  
  static void
--- 4656,4662 ----
  	}
  	window_copy_update_cursor(wme, px, cy);
  	if (window_copy_update_selection(wme, 1, 0))
! 		window_copy_redraw_lines(wme, data->cy, nd);
  }
  
  static void