===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** src/usr.bin/tmux/Attic/window-choose.c	2015/12/11 12:27:36	1.72
--- src/usr.bin/tmux/Attic/window-choose.c	2015/12/11 16:37:21	1.73
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.72 2015/12/11 12:27:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.73 2015/12/11 16:37:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 35,45 ****
  struct window_choose_mode_item *window_choose_get_item(struct window_pane *,
  	    key_code, struct mouse_event *);
  
! void	window_choose_fire_callback(
! 	    struct window_pane *, struct window_choose_data *);
  void	window_choose_redraw_screen(struct window_pane *);
! void	window_choose_write_line(
! 	    struct window_pane *, struct screen_write_ctx *, u_int);
  
  void	window_choose_scroll_up(struct window_pane *);
  void	window_choose_scroll_down(struct window_pane *);
--- 35,45 ----
  struct window_choose_mode_item *window_choose_get_item(struct window_pane *,
  	    key_code, struct mouse_event *);
  
! void	window_choose_fire_callback(struct window_pane *,
! 	    struct window_choose_data *);
  void	window_choose_redraw_screen(struct window_pane *);
! void	window_choose_write_line(struct window_pane *,
! 	    struct screen_write_ctx *, u_int);
  
  void	window_choose_scroll_up(struct window_pane *);
  void	window_choose_scroll_down(struct window_pane *);
***************
*** 299,306 ****
  }
  
  void
! window_choose_fire_callback(
!     struct window_pane *wp, struct window_choose_data *wcd)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  
--- 299,306 ----
  }
  
  void
! window_choose_fire_callback(struct window_pane *wp,
!     struct window_choose_data *wcd)
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  
***************
*** 614,623 ****
  			window_choose_scroll_up(wp);
  		else {
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(
! 			    wp, &ctx, data->selected - data->top);
! 			window_choose_write_line(
! 			    wp, &ctx, data->selected + 1 - data->top);
  			screen_write_stop(&ctx);
  		}
  		break;
--- 614,623 ----
  			window_choose_scroll_up(wp);
  		else {
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(wp, &ctx,
! 			    data->selected - data->top);
! 			window_choose_write_line(wp, &ctx,
! 			    data->selected + 1 - data->top);
  			screen_write_stop(&ctx);
  		}
  		break;
***************
*** 634,643 ****
  
  		if (data->selected < data->top + screen_size_y(s)) {
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(
! 			    wp, &ctx, data->selected - data->top);
! 			window_choose_write_line(
! 			    wp, &ctx, data->selected - 1 - data->top);
  			screen_write_stop(&ctx);
  		} else
  			window_choose_scroll_down(wp);
--- 634,643 ----
  
  		if (data->selected < data->top + screen_size_y(s)) {
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(wp, &ctx,
! 			    data->selected - data->top);
! 			window_choose_write_line(wp, &ctx,
! 			    data->selected - 1 - data->top);
  			screen_write_stop(&ctx);
  		} else
  			window_choose_scroll_down(wp);
***************
*** 649,656 ****
  			data->selected--;
  			window_choose_scroll_up(wp);
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(
! 			    wp, &ctx, screen_size_y(s) - 1);
  			screen_write_stop(&ctx);
  		} else
  			window_choose_scroll_up(wp);
--- 649,656 ----
  			data->selected--;
  			window_choose_scroll_up(wp);
  			screen_write_start(&ctx, wp, NULL);
! 			window_choose_write_line(wp, &ctx,
! 			    screen_size_y(s) - 1);
  			screen_write_stop(&ctx);
  		} else
  			window_choose_scroll_up(wp);