===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -c -r1.1086 -r1.1087
*** src/usr.bin/tmux/tmux.h	2021/01/20 07:16:54	1.1086
--- src/usr.bin/tmux/tmux.h	2021/01/29 09:48:43	1.1087
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.1086 2021/01/20 07:16:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.1087 2021/01/29 09:48:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 55,62 ****
  struct options;
  struct options_array_item;
  struct options_entry;
! struct screen_write_collect_item;
! struct screen_write_collect_line;
  struct screen_write_ctx;
  struct session;
  struct tty_ctx;
--- 55,62 ----
  struct options;
  struct options_array_item;
  struct options_entry;
! struct screen_write_citem;
! struct screen_write_cline;
  struct screen_write_ctx;
  struct session;
  struct tty_ctx;
***************
*** 794,848 ****
  struct screen_sel;
  struct screen_titles;
  struct screen {
! 	char			*title;
! 	char			*path;
! 	struct screen_titles	*titles;
  
! 	struct grid		*grid;		/* grid data */
  
! 	u_int			 cx;		/* cursor x */
! 	u_int			 cy;		/* cursor y */
  
! 	u_int			 cstyle;	/* cursor style */
! 	char			*ccolour;	/* cursor colour string */
  
! 	u_int			 rupper;	/* scroll region top */
! 	u_int			 rlower;	/* scroll region bottom */
  
! 	int			 mode;
  
! 	u_int			 saved_cx;
! 	u_int			 saved_cy;
! 	struct grid		*saved_grid;
! 	struct grid_cell	 saved_cell;
! 	int			 saved_flags;
  
! 	bitstr_t		*tabs;
! 	struct screen_sel	*sel;
  
! 	struct screen_write_collect_line *write_list;
  };
  
  /* Screen write context. */
  typedef void (*screen_write_init_ctx_cb)(struct screen_write_ctx *,
      struct tty_ctx *);
  struct screen_write_ctx {
! 	struct window_pane	*wp;
! 	struct screen		*s;
  
! 	int			 flags;
  #define SCREEN_WRITE_SYNC 0x1
  
! 	screen_write_init_ctx_cb init_ctx_cb;
! 	void			*arg;
  
! 	struct screen_write_collect_item *item;
! 	u_int			 scrolled;
! 	u_int			 bg;
! 
! 	u_int			 cells;
! 	u_int			 written;
! 	u_int			 skipped;
  };
  
  /* Screen redraw context. */
--- 794,844 ----
  struct screen_sel;
  struct screen_titles;
  struct screen {
! 	char				*title;
! 	char				*path;
! 	struct screen_titles		*titles;
  
! 	struct grid			*grid;	  /* grid data */
  
! 	u_int				 cx;	  /* cursor x */
! 	u_int				 cy;	  /* cursor y */
  
! 	u_int				 cstyle;  /* cursor style */
! 	char				*ccolour; /* cursor colour string */
  
! 	u_int				 rupper;  /* scroll region top */
! 	u_int				 rlower;  /* scroll region bottom */
  
! 	int				 mode;
  
! 	u_int				 saved_cx;
! 	u_int				 saved_cy;
! 	struct grid			*saved_grid;
! 	struct grid_cell		 saved_cell;
! 	int				 saved_flags;
  
! 	bitstr_t			*tabs;
! 	struct screen_sel		*sel;
  
! 	struct screen_write_cline	*write_list;
  };
  
  /* Screen write context. */
  typedef void (*screen_write_init_ctx_cb)(struct screen_write_ctx *,
      struct tty_ctx *);
  struct screen_write_ctx {
! 	struct window_pane		*wp;
! 	struct screen			*s;
  
! 	int				 flags;
  #define SCREEN_WRITE_SYNC 0x1
  
! 	screen_write_init_ctx_cb	 init_ctx_cb;
! 	void				*arg;
  
! 	struct screen_write_citem	*item;
! 	u_int				 scrolled;
! 	u_int				 bg;
  };
  
  /* Screen redraw context. */
***************
*** 1000,1008 ****
  
  	char		*searchstr;
  	int		 searchregex;
- 
- 	size_t		 written;
- 	size_t		 skipped;
  
  	int		 border_gc_set;
  	struct grid_cell border_gc;
--- 996,1001 ----