===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-redraw.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -c -r1.86 -r1.87
*** src/usr.bin/tmux/screen-redraw.c	2021/08/11 09:05:21	1.86
--- src/usr.bin/tmux/screen-redraw.c	2021/08/11 20:49:55	1.87
***************
*** 1,4 ****
! /* $OpenBSD: screen-redraw.c,v 1.86 2021/08/11 09:05:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-redraw.c,v 1.87 2021/08/11 20:49:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 800,811 ****
  static void
  screen_redraw_draw_pane(struct screen_redraw_ctx *ctx, struct window_pane *wp)
  {
! 	struct client	*c = ctx->c;
! 	struct window	*w = c->session->curw->window;
! 	struct tty	*tty = &c->tty;
! 	struct screen	*s;
! 	struct grid_cell defaults;
! 	u_int		 i, j, top, x, y, width;
  
  	log_debug("%s: %s @%u %%%u", __func__, c->name, w->id, wp->id);
  
--- 800,812 ----
  static void
  screen_redraw_draw_pane(struct screen_redraw_ctx *ctx, struct window_pane *wp)
  {
! 	struct client		*c = ctx->c;
! 	struct window		*w = c->session->curw->window;
! 	struct tty		*tty = &c->tty;
! 	struct screen		*s = wp->screen;
! 	struct colour_palette	*palette = &wp->palette;
! 	struct grid_cell	 defaults;
! 	u_int			 i, j, top, x, y, width;
  
  	log_debug("%s: %s @%u %%%u", __func__, c->name, w->id, wp->id);
  
***************
*** 815,822 ****
  		top = ctx->statuslines;
  	else
  		top = 0;
- 
- 	s = wp->screen;
  	for (j = 0; j < wp->sy; j++) {
  		if (wp->yoff + j < ctx->oy || wp->yoff + j >= ctx->oy + ctx->sy)
  			continue;
--- 816,821 ----
***************
*** 849,855 ****
  		    __func__, c->name, wp->id, i, j, x, y, width);
  
  		tty_default_colours(&defaults, wp);
! 		tty_draw_line(tty, s, i, j, width, x, y, &defaults,
! 		    wp->palette);
  	}
  }
--- 848,853 ----
  		    __func__, c->name, wp->id, i, j, x, y, width);
  
  		tty_default_colours(&defaults, wp);
! 		tty_draw_line(tty, s, i, j, width, x, y, &defaults, palette);
  	}
  }