===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -c -r1.220 -r1.221
*** src/usr.bin/tmux/window.c	2019/03/14 09:50:09	1.220
--- src/usr.bin/tmux/window.c	2019/03/14 09:53:52	1.221
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.220 2019/03/14 09:50:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.221 2019/03/14 09:53:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 470,476 ****
  void
  window_redraw_active_switch(struct window *w, struct window_pane *wp)
  {
! 	const struct grid_cell	*gc;
  
  	if (wp == w->active)
  		return;
--- 470,476 ----
  void
  window_redraw_active_switch(struct window *w, struct window_pane *wp)
  {
! 	struct style	*sy;
  
  	if (wp == w->active)
  		return;
***************
*** 479,499 ****
  	 * If window-style and window-active-style are the same, we don't need
  	 * to redraw panes when switching active panes.
  	 */
! 	gc = options_get_style(w->options, "window-active-style");
! 	if (style_equal(gc, options_get_style(w->options, "window-style")))
  		return;
  
  	/*
  	 * If the now active or inactive pane do not have a custom style or if
  	 * the palette is different, they need to be redrawn.
  	 */
! 	if (window_pane_get_palette(w->active, w->active->colgc.fg) != -1 ||
! 	    window_pane_get_palette(w->active, w->active->colgc.bg) != -1 ||
! 	    style_equal(&grid_default_cell, &w->active->colgc))
  		w->active->flags |= PANE_REDRAW;
! 	if (window_pane_get_palette(wp, wp->colgc.fg) != -1 ||
! 	    window_pane_get_palette(wp, wp->colgc.bg) != -1 ||
! 	    style_equal(&grid_default_cell, &wp->colgc))
  		wp->flags |= PANE_REDRAW;
  }
  
--- 479,499 ----
  	 * If window-style and window-active-style are the same, we don't need
  	 * to redraw panes when switching active panes.
  	 */
! 	sy = options_get_style(w->options, "window-active-style");
! 	if (style_equal(sy, options_get_style(w->options, "window-style")))
  		return;
  
  	/*
  	 * If the now active or inactive pane do not have a custom style or if
  	 * the palette is different, they need to be redrawn.
  	 */
! 	if (window_pane_get_palette(w->active, w->active->style.gc.fg) != -1 ||
! 	    window_pane_get_palette(w->active, w->active->style.gc.bg) != -1 ||
! 	    style_is_default(&w->active->style))
  		w->active->flags |= PANE_REDRAW;
! 	if (window_pane_get_palette(wp, wp->style.gc.fg) != -1 ||
! 	    window_pane_get_palette(wp, wp->style.gc.bg) != -1 ||
! 	    style_is_default(&wp->style))
  		wp->flags |= PANE_REDRAW;
  }
  
***************
*** 826,832 ****
  
  	wp->saved_grid = NULL;
  
! 	memcpy(&wp->colgc, &grid_default_cell, sizeof wp->colgc);
  
  	screen_init(&wp->base, sx, sy, hlimit);
  	wp->screen = &wp->base;
--- 826,832 ----
  
  	wp->saved_grid = NULL;
  
! 	style_set(&wp->style, &grid_default_cell);
  
  	screen_init(&wp->base, sx, sy, hlimit);
  	wp->screen = &wp->base;