===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/popup.c	2021/10/11 13:27:50	1.36
--- src/usr.bin/tmux/popup.c	2021/10/13 09:28:36	1.37
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.36 2021/10/11 13:27:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.37 2021/10/13 09:28:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 212,227 ****
  	u_int			 i, px = pd->px, py = pd->py;
  	struct colour_palette	*palette = &pd->palette;
  	struct grid_cell	 gc;
  
  	screen_init(&s, pd->sx, pd->sy, 0);
  	screen_write_start(&ctx, &s);
  	screen_write_clearscreen(&ctx, 8);
  
  	if (pd->flags & POPUP_NOBORDER) {
  		screen_write_cursormove(&ctx, 0, 0, 0);
  		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx, pd->sy);
  	} else if (pd->sx > 2 && pd->sy > 2) {
! 		screen_write_box(&ctx, pd->sx, pd->sy);
  		screen_write_cursormove(&ctx, 1, 1, 0);
  		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2,
  		    pd->sy - 2);
--- 212,233 ----
  	u_int			 i, px = pd->px, py = pd->py;
  	struct colour_palette	*palette = &pd->palette;
  	struct grid_cell	 gc;
+ 	struct grid_cell	 bgc;
+ 	struct options          *o = c->session->curw->window->options;
  
  	screen_init(&s, pd->sx, pd->sy, 0);
  	screen_write_start(&ctx, &s);
  	screen_write_clearscreen(&ctx, 8);
  
+ 	memcpy(&bgc, &grid_default_cell, sizeof bgc);
+ 	style_apply(&bgc, o, "popup-border-style", NULL);
+ 	bgc.attr = 0;
+ 
  	if (pd->flags & POPUP_NOBORDER) {
  		screen_write_cursormove(&ctx, 0, 0, 0);
  		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx, pd->sy);
  	} else if (pd->sx > 2 && pd->sy > 2) {
! 		screen_write_box(&ctx, pd->sx, pd->sy, &bgc);
  		screen_write_cursormove(&ctx, 1, 1, 0);
  		screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2,
  		    pd->sy - 2);
***************
*** 229,236 ****
  	screen_write_stop(&ctx);
  
  	memcpy(&gc, &grid_default_cell, sizeof gc);
! 	gc.fg = pd->palette.fg;
! 	gc.bg = pd->palette.bg;
  
  	if (pd->md != NULL) {
  		c->overlay_check = menu_check_cb;
--- 235,244 ----
  	screen_write_stop(&ctx);
  
  	memcpy(&gc, &grid_default_cell, sizeof gc);
! 	style_apply(&gc, o, "popup-style", NULL);
! 	gc.attr = 0;
! 	palette->fg = gc.fg;
! 	palette->bg = gc.bg;
  
  	if (pd->md != NULL) {
  		c->overlay_check = menu_check_cb;