===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.830
retrieving revision 1.831
diff -c -r1.830 -r1.831
*** src/usr.bin/tmux/tmux.h	2018/07/30 11:24:55	1.830
--- src/usr.bin/tmux/tmux.h	2018/07/31 11:49:26	1.831
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.830 2018/07/30 11:24:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.831 2018/07/31 11:49:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 644,673 ****
  };
  LIST_HEAD(joblist, job);
  
- /* Screen selection. */
- struct screen_sel {
- 	int		 flag;
- 	int		 hidden;
- 
- 	int		 rectflag;
- 	enum {
- 		LINE_SEL_NONE,
- 		LINE_SEL_LEFT_RIGHT,
- 		LINE_SEL_RIGHT_LEFT,
- 	} lineflag;
- 
- 	int		 modekeys;
- 
- 	u_int		 sx;
- 	u_int		 sy;
- 
- 	u_int		 ex;
- 	u_int		 ey;
- 
- 	struct grid_cell cell;
- };
- 
  /* Virtual screen. */
  struct screen_titles;
  struct screen {
  	char			*title;
--- 644,651 ----
  };
  LIST_HEAD(joblist, job);
  
  /* Virtual screen. */
+ struct screen_sel;
  struct screen_titles;
  struct screen {
  	char			*title;
***************
*** 688,694 ****
  
  	bitstr_t		*tabs;
  
! 	struct screen_sel	 sel;
  };
  
  /* Screen write context. */
--- 666,672 ----
  
  	bitstr_t		*tabs;
  
! 	struct screen_sel	*sel;
  };
  
  /* Screen write context. */
***************
*** 2086,2093 ****
  void	 screen_push_title(struct screen *);
  void	 screen_pop_title(struct screen *);
  void	 screen_resize(struct screen *, u_int, u_int, int);
! void	 screen_set_selection(struct screen *,
! 	     u_int, u_int, u_int, u_int, u_int, struct grid_cell *);
  void	 screen_clear_selection(struct screen *);
  void	 screen_hide_selection(struct screen *);
  int	 screen_check_selection(struct screen *, u_int, u_int);
--- 2064,2071 ----
  void	 screen_push_title(struct screen *);
  void	 screen_pop_title(struct screen *);
  void	 screen_resize(struct screen *, u_int, u_int, int);
! void	 screen_set_selection(struct screen *, u_int, u_int, u_int, u_int,
! 	     u_int, int, struct grid_cell *);
  void	 screen_clear_selection(struct screen *);
  void	 screen_hide_selection(struct screen *);
  int	 screen_check_selection(struct screen *, u_int, u_int);