===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -c -r1.333 -r1.334
*** src/usr.bin/tmux/window-copy.c	2022/02/03 07:26:43	1.333
--- src/usr.bin/tmux/window-copy.c	2022/05/30 13:00:19	1.334
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.333 2022/02/03 07:26:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.334 2022/05/30 13:00:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 222,227 ****
--- 222,229 ----
  
  	struct screen	*backing;
  	int		 backing_written; /* backing display started */
+ 	struct screen	*writing;
+ 	struct input_ctx *ictx;
  
  	int		 viewmode;	/* view mode entered */
  
***************
*** 467,479 ****
  	struct window_pane		*wp = wme->wp;
  	struct window_copy_mode_data	*data;
  	struct screen			*base = &wp->base;
! 	struct screen			*s;
  
  	data = window_copy_common_init(wme);
  	data->viewmode = 1;
  
! 	data->backing = s = xmalloc(sizeof *data->backing);
! 	screen_init(s, screen_size_x(base), screen_size_y(base), UINT_MAX);
  	data->mx = data->cx;
  	data->my = screen_hsize(data->backing) + data->cy - data->oy;
  	data->showmark = 0;
--- 469,484 ----
  	struct window_pane		*wp = wme->wp;
  	struct window_copy_mode_data	*data;
  	struct screen			*base = &wp->base;
! 	u_int				 sx = screen_size_x(base);
  
  	data = window_copy_common_init(wme);
  	data->viewmode = 1;
  
! 	data->backing = xmalloc(sizeof *data->backing);
! 	screen_init(data->backing, sx, screen_size_y(base), UINT_MAX);
! 	data->writing = xmalloc(sizeof *data->writing);
! 	screen_init(data->writing, sx, screen_size_y(base), 0);
! 	data->ictx = input_init(NULL, NULL, NULL);
  	data->mx = data->cx;
  	data->my = screen_hsize(data->backing) + data->cy - data->oy;
  	data->showmark = 0;
***************
*** 492,497 ****
--- 497,508 ----
  	free(data->searchstr);
  	free(data->jumpchar);
  
+ 	if (data->writing != NULL) {
+ 		screen_free(data->writing);
+ 		free(data->writing);
+ 	}
+ 	if (data->ictx != NULL)
+ 		input_free(data->ictx);
  	screen_free(data->backing);
  	free(data->backing);
  
***************
*** 500,540 ****
  }
  
  void
! window_copy_add(struct window_pane *wp, const char *fmt, ...)
  {
  	va_list	ap;
  
  	va_start(ap, fmt);
! 	window_copy_vadd(wp, fmt, ap);
  	va_end(ap);
  }
  
  void
! window_copy_vadd(struct window_pane *wp, const char *fmt, va_list ap)
  {
  	struct window_mode_entry	*wme = TAILQ_FIRST(&wp->modes);
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*backing = data->backing;
! 	struct screen_write_ctx	 	 back_ctx, ctx;
  	struct grid_cell		 gc;
  	u_int				 old_hsize, old_cy;
  
! 	memcpy(&gc, &grid_default_cell, sizeof gc);
  
  	old_hsize = screen_hsize(data->backing);
! 	screen_write_start(&back_ctx, backing);
  	if (data->backing_written) {
  		/*
  		 * On the second or later line, do a CRLF before writing
  		 * (so it's on a new line).
  		 */
! 		screen_write_carriagereturn(&back_ctx);
! 		screen_write_linefeed(&back_ctx, 0, 8);
  	} else
  		data->backing_written = 1;
  	old_cy = backing->cy;
! 	screen_write_vnputs(&back_ctx, 0, &gc, fmt, ap);
! 	screen_write_stop(&back_ctx);
  
  	data->oy += screen_hsize(data->backing) - old_hsize;
  
--- 511,577 ----
  }
  
  void
! window_copy_add(struct window_pane *wp, int parse, const char *fmt, ...)
  {
  	va_list	ap;
  
  	va_start(ap, fmt);
! 	window_copy_vadd(wp, parse, fmt, ap);
  	va_end(ap);
  }
  
+ static void
+ window_copy_init_ctx_cb(__unused struct screen_write_ctx *ctx,
+     struct tty_ctx *ttyctx)
+ {
+ 	memcpy(&ttyctx->defaults, &grid_default_cell, sizeof ttyctx->defaults);
+ 	ttyctx->palette = NULL;
+ 	ttyctx->redraw_cb = NULL;
+ 	ttyctx->set_client_cb = NULL;
+ 	ttyctx->arg = NULL;
+ }
+ 
  void
! window_copy_vadd(struct window_pane *wp, int parse, const char *fmt, va_list ap)
  {
  	struct window_mode_entry	*wme = TAILQ_FIRST(&wp->modes);
  	struct window_copy_mode_data	*data = wme->data;
  	struct screen			*backing = data->backing;
! 	struct screen			*writing = data->writing;
! 	struct screen_write_ctx	 	 writing_ctx, backing_ctx, ctx;
  	struct grid_cell		 gc;
  	u_int				 old_hsize, old_cy;
+ 	u_int				 sx = screen_size_x(backing);
+ 	char				*text;
  
! 	if (parse) {
! 		vasprintf(&text, fmt, ap);
! 		screen_write_start(&writing_ctx, writing);
! 		screen_write_reset(&writing_ctx);
! 		input_parse_screen(data->ictx, writing, window_copy_init_ctx_cb,
! 		    data, text, strlen(text));
! 		free(text);
! 	}
  
  	old_hsize = screen_hsize(data->backing);
! 	screen_write_start(&backing_ctx, backing);
  	if (data->backing_written) {
  		/*
  		 * On the second or later line, do a CRLF before writing
  		 * (so it's on a new line).
  		 */
! 		screen_write_carriagereturn(&backing_ctx);
! 		screen_write_linefeed(&backing_ctx, 0, 8);
  	} else
  		data->backing_written = 1;
  	old_cy = backing->cy;
! 	if (parse)
! 		screen_write_fast_copy(&backing_ctx, writing, 0, 0, sx, 1);
! 	else {
! 		memcpy(&gc, &grid_default_cell, sizeof gc);
! 		screen_write_vnputs(&backing_ctx, 0, &gc, fmt, ap);
! 	}
! 	screen_write_stop(&backing_ctx);
  
  	data->oy += screen_hsize(data->backing) - old_hsize;