===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-redraw.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -c -r1.94 -r1.95
*** src/usr.bin/tmux/screen-redraw.c	2022/02/04 11:57:22	1.94
--- src/usr.bin/tmux/screen-redraw.c	2022/03/16 17:00:17	1.95
***************
*** 1,4 ****
! /* $OpenBSD: screen-redraw.c,v 1.94 2022/02/04 11:57:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-redraw.c,v 1.95 2022/03/16 17:00:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 47,57 ****
  
  /* Get cell border character. */
  static void
! screen_redraw_border_set(struct window_pane *wp, enum pane_lines pane_lines,
!     int cell_type, struct grid_cell *gc)
  {
  	u_int	idx;
  
  	switch (pane_lines) {
  	case PANE_LINES_NUMBER:
  		if (cell_type == CELL_OUTSIDE) {
--- 47,62 ----
  
  /* Get cell border character. */
  static void
! screen_redraw_border_set(struct window *w, struct window_pane *wp,
!     enum pane_lines pane_lines, int cell_type, struct grid_cell *gc)
  {
  	u_int	idx;
  
+ 	if (cell_type == CELL_OUTSIDE && w->fill_character != NULL) {
+ 		utf8_copy(&gc->data, &w->fill_character[0]);
+ 		return;
+ 	}
+ 
  	switch (pane_lines) {
  	case PANE_LINES_NUMBER:
  		if (cell_type == CELL_OUTSIDE) {
***************
*** 409,415 ****
  		else
  			py = wp->yoff + wp->sy;
  		cell_type = screen_redraw_type_of_cell(c, px, py, pane_status);
! 		screen_redraw_border_set(wp, pane_lines, cell_type, &gc);
  		screen_write_cell(&ctx, &gc);
  	}
  	gc.attr &= ~GRID_ATTR_CHARSET;
--- 414,420 ----
  		else
  			py = wp->yoff + wp->sy;
  		cell_type = screen_redraw_type_of_cell(c, px, py, pane_status);
! 		screen_redraw_border_set(w, wp, pane_lines, cell_type, &gc);
  		screen_write_cell(&ctx, &gc);
  	}
  	gc.attr &= ~GRID_ATTR_CHARSET;
***************
*** 690,696 ****
  		    screen_redraw_check_is(x, y, pane_status, marked_pane.wp))
  			gc.attr ^= GRID_ATTR_REVERSE;
  	}
! 	screen_redraw_border_set(wp, ctx->pane_lines, cell_type, &gc);
  
  	if (cell_type == CELL_TOPBOTTOM &&
  	    (c->flags & CLIENT_UTF8) &&
--- 695,701 ----
  		    screen_redraw_check_is(x, y, pane_status, marked_pane.wp))
  			gc.attr ^= GRID_ATTR_REVERSE;
  	}
! 	screen_redraw_border_set(w, wp, ctx->pane_lines, cell_type, &gc);
  
  	if (cell_type == CELL_TOPBOTTOM &&
  	    (c->flags & CLIENT_UTF8) &&