===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-redraw.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -c -r1.75 -r1.76
*** src/usr.bin/tmux/screen-redraw.c	2020/05/16 15:01:31	1.75
--- src/usr.bin/tmux/screen-redraw.c	2020/05/16 15:34:08	1.76
***************
*** 1,4 ****
! /* $OpenBSD: screen-redraw.c,v 1.75 2020/05/16 15:01:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-redraw.c,v 1.76 2020/05/16 15:34:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 346,352 ****
  	screen_init(&wp->status_screen, width, 1, 0);
  	wp->status_screen.mode = 0;
  
! 	screen_write_start(&ctx, NULL, &wp->status_screen);
  
  	gc.attr |= GRID_ATTR_CHARSET;
  	for (i = 0; i < width; i++)
--- 346,352 ----
  	screen_init(&wp->status_screen, width, 1, 0);
  	wp->status_screen.mode = 0;
  
! 	screen_write_start(&ctx, &wp->status_screen);
  
  	gc.attr |= GRID_ATTR_CHARSET;
  	for (i = 0; i < width; i++)
***************
*** 423,429 ****
  
  		if (ctx->statustop)
  			yoff += ctx->statuslines;
! 		tty_draw_line(tty, NULL, s, i, 0, width, x, yoff - ctx->oy);
  	}
  	tty_cursor(tty, 0, 0);
  }
--- 423,430 ----
  
  		if (ctx->statustop)
  			yoff += ctx->statuslines;
! 		tty_draw_line(tty, s, i, 0, width, x, yoff - ctx->oy,
! 		    &grid_default_cell, NULL);
  	}
  	tty_cursor(tty, 0, 0);
  }
***************
*** 615,621 ****
  		}
  	}
  
! 	tty_attributes(tty, gc, NULL);
  	if (ctx->statustop)
  		tty_cursor(tty, i, ctx->statuslines + j);
  	else
--- 616,622 ----
  		}
  	}
  
! 	tty_attributes(tty, gc, &grid_default_cell, NULL);
  	if (ctx->statustop)
  		tty_cursor(tty, i, ctx->statuslines + j);
  	else
***************
*** 676,683 ****
  		y = 0;
  	else
  		y = c->tty.sy - ctx->statuslines;
! 	for (i = 0; i < ctx->statuslines; i++)
! 		tty_draw_line(tty, NULL, s, 0, i, UINT_MAX, 0, y + i);
  }
  
  /* Draw one pane. */
--- 677,686 ----
  		y = 0;
  	else
  		y = c->tty.sy - ctx->statuslines;
! 	for (i = 0; i < ctx->statuslines; i++) {
! 		tty_draw_line(tty, s, 0, i, UINT_MAX, 0, y + i,
! 		    &grid_default_cell, NULL);
! 	}
  }
  
  /* Draw one pane. */
***************
*** 688,693 ****
--- 691,697 ----
  	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);
***************
*** 731,736 ****
  		log_debug("%s: %s %%%u line %u,%u at %u,%u, width %u",
  		    __func__, c->name, wp->id, i, j, x, y, width);
  
! 		tty_draw_line(tty, wp, s, i, j, width, x, y);
  	}
  }
--- 735,742 ----
  		log_debug("%s: %s %%%u line %u,%u at %u,%u, width %u",
  		    __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);
  	}
  }