===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/tmux/window-copy.c	2010/02/22 20:28:21	1.47
--- src/usr.bin/tmux/window-copy.c	2010/02/22 20:41:16	1.48
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.47 2010/02/22 20:28:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.48 2010/02/22 20:41:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 226,232 ****
  void
  window_copy_key(struct window_pane *wp, struct client *c, int key)
  {
! 	const char			*word_separators = " -_@";
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
  	u_int				 n;
--- 226,232 ----
  void
  window_copy_key(struct window_pane *wp, struct client *c, int key)
  {
! 	const char			*word_separators;
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
  	u_int				 n;
***************
*** 356,370 ****
--- 356,376 ----
  		window_copy_cursor_next_word_end(wp, " ");
  		break;
  	case MODEKEYCOPY_NEXTWORD:
+ 		word_separators =
+ 		    options_get_string(&wp->window->options, "word-separators");
  		window_copy_cursor_next_word(wp, word_separators);
  		break;
  	case MODEKEYCOPY_NEXTWORDEND:
+ 		word_separators =
+ 		    options_get_string(&wp->window->options, "word-separators");
  		window_copy_cursor_next_word_end(wp, word_separators);
  		break;
  	case MODEKEYCOPY_PREVIOUSSPACE:
  		window_copy_cursor_previous_word(wp, " ");
  		break;
  	case MODEKEYCOPY_PREVIOUSWORD:
+ 		word_separators =
+ 		    options_get_string(&wp->window->options, "word-separators");
  		window_copy_cursor_previous_word(wp, word_separators);
  		break;
  	case MODEKEYCOPY_SEARCHUP:
***************
*** 1271,1301 ****
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*base_s = &wp->base;
  	u_int				 px, py, xx, yy;
  
  	px = data->cx;
  	py = screen_hsize(base_s) + data->cy - data->oy;
  	xx = window_copy_find_length(wp, py);
  	yy = screen_hsize(base_s) + screen_size_y(base_s) - 1;
  
! 	/* Are we in a word? Skip it! */
! 	while (!window_copy_in_set(wp, px, py, separators))
! 		px++;
  
! 	/* Find the start of a word. */
! 	while (px > xx || window_copy_in_set(wp, px, py, separators)) {
! 		/* Past the end of the line? Nothing but spaces. */
! 		if (px > xx) {
! 			if (py == yy)
! 				return;
! 			window_copy_cursor_down(wp, 0);
! 			px = 0;
  
- 			py = screen_hsize(base_s) + data->cy - data->oy;
- 			xx = window_copy_find_length(wp, py);
- 		} else
- 			px++;
- 	}
- 
  	window_copy_update_cursor(wp, px, data->cy);
  	if (window_copy_update_selection(wp))
  		window_copy_redraw_lines(wp, data->cy, 1);
--- 1277,1313 ----
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*base_s = &wp->base;
  	u_int				 px, py, xx, yy;
+ 	int				 expected = 0;
  
  	px = data->cx;
  	py = screen_hsize(base_s) + data->cy - data->oy;
  	xx = window_copy_find_length(wp, py);
  	yy = screen_hsize(base_s) + screen_size_y(base_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(wp, 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(wp, 0);
! 				px = 0;
  
! 				py = screen_hsize(base_s) + data->cy - data->oy;
! 				xx = window_copy_find_length(wp, py);
! 			} else
! 				px++;
! 		}
! 		expected = !expected;
! 	} while (expected == 1);
  
  	window_copy_update_cursor(wp, px, data->cy);
  	if (window_copy_update_selection(wp))
  		window_copy_redraw_lines(wp, data->cy, 1);
***************
*** 1307,1336 ****
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*base_s = &wp->base;
  	u_int				 px, py, xx, yy;
  
  	px = data->cx;
  	py = screen_hsize(base_s) + data->cy - data->oy;
  	xx = window_copy_find_length(wp, py);
  	yy = screen_hsize(base_s) + screen_size_y(base_s) - 1;
  
! 	/* Are we on spaces? Skip 'em! */
! 	while (px > xx || window_copy_in_set(wp, px, py, separators)) {
! 		/* Nothing but spaces past the end of the line, so move down. */
! 		if (px > xx) {
! 			if (py == yy)
! 				return;
! 			window_copy_cursor_down(wp, 0);
! 			px = 0;
  
! 			py = screen_hsize(base_s) + data->cy - data->oy;
! 			xx = window_copy_find_length(wp, py);
! 		} else
! 			px++;
! 	}
! 
! 	/* Find the end of this word. */
! 	while (!window_copy_in_set(wp, px, py, separators))
! 		px++;
  
  	window_copy_update_cursor(wp, px, data->cy);
  	if (window_copy_update_selection(wp))
--- 1319,1354 ----
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*base_s = &wp->base;
  	u_int				 px, py, xx, yy;
+ 	int				 expected = 1;
  
  	px = data->cx;
  	py = screen_hsize(base_s) + data->cy - data->oy;
  	xx = window_copy_find_length(wp, py);
  	yy = screen_hsize(base_s) + screen_size_y(base_s) - 1;
  
! 	/*
! 	 * First skip past any word characters, then any nonword characters.
! 	 *
! 	 * expected is initially set to 1 for the former and then 0 for the
! 	 * latter.
! 	 */
! 	do {
! 		while (px > xx ||
! 		    window_copy_in_set(wp, 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(wp, 0);
! 				px = 0;
  
! 				py = screen_hsize(base_s) + data->cy - data->oy;
! 				xx = window_copy_find_length(wp, py);
! 			} else
! 				px++;
! 		}
! 		expected = !expected;
! 	} while (expected == 0);
  
  	window_copy_update_cursor(wp, px, data->cy);
  	if (window_copy_update_selection(wp))