===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/tmux/popup.c	2021/10/25 09:22:17	1.41
--- src/usr.bin/tmux/popup.c	2021/10/25 09:38:36	1.42
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.41 2021/10/25 09:22:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.42 2021/10/25 09:38:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 237,245 ****
  	screen_write_stop(&ctx);
  
  	memcpy(&defaults, &pd->defaults, sizeof defaults);
! 	if (COLOUR_DEFAULT(defaults.fg))
  		defaults.fg = palette->fg;
! 	if (COLOUR_DEFAULT(defaults.bg))
  		defaults.bg = palette->bg;
  
  	if (pd->md != NULL) {
--- 237,245 ----
  	screen_write_stop(&ctx);
  
  	memcpy(&defaults, &pd->defaults, sizeof defaults);
! 	if (defaults.fg == 8)
  		defaults.fg = palette->fg;
! 	if (defaults.bg == 8)
  		defaults.bg = palette->bg;
  
  	if (pd->md != NULL) {
***************
*** 636,646 ****
  popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
      u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
      int argc, char **argv, const char *cwd, const char *title, struct client *c,
!     struct session *s, popup_close_cb cb, void *arg)
  {
  	struct popup_data	*pd;
  	u_int			 jx, jy;
  	struct options		*o;
  
  	if (s != NULL)
  		o = s->curw->window->options;
--- 636,648 ----
  popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
      u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
      int argc, char **argv, const char *cwd, const char *title, struct client *c,
!     struct session *s, const char* style, const char* border_style,
!     popup_close_cb cb, void *arg)
  {
  	struct popup_data	*pd;
  	u_int			 jx, jy;
  	struct options		*o;
+ 	struct style		 sytmp;
  
  	if (s != NULL)
  		o = s->curw->window->options;
***************
*** 678,683 ****
--- 680,692 ----
  	pd->border_lines = lines;
  	memcpy(&pd->border_cell, &grid_default_cell, sizeof pd->border_cell);
  	style_apply(&pd->border_cell, o, "popup-border-style", NULL);
+ 	if (border_style != NULL) {
+ 		style_set(&sytmp, &grid_default_cell);
+ 		if (style_parse(&sytmp, &pd->border_cell, border_style) == 0) {
+ 			pd->border_cell.fg = sytmp.gc.fg;
+ 			pd->border_cell.bg = sytmp.gc.bg;
+ 		}
+ 	}
  	pd->border_cell.attr = 0;
  
  	screen_init(&pd->s, sx - 2, sy - 2, 0);
***************
*** 686,691 ****
--- 695,707 ----
  
  	memcpy(&pd->defaults, &grid_default_cell, sizeof pd->defaults);
  	style_apply(&pd->defaults, o, "popup-style", NULL);
+ 	if (style != NULL) {
+ 		style_set(&sytmp, &grid_default_cell);
+ 		if (style_parse(&sytmp, &pd->defaults, style) == 0) {
+ 			pd->defaults.fg = sytmp.gc.fg;
+ 			pd->defaults.bg = sytmp.gc.bg;
+ 		}
+ 	}
  	pd->defaults.attr = 0;
  
  	pd->px = px;
***************
*** 789,795 ****
  	xasprintf(&cmd, "%s %s", editor, path);
  	if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, BOX_LINES_DEFAULT,
  	    NULL, px, py, sx, sy, NULL, cmd, 0, NULL, _PATH_TMP, NULL, c, NULL,
! 	    popup_editor_close_cb, pe) != 0) {
  		popup_editor_free(pe);
  		free(cmd);
  		return (-1);
--- 805,811 ----
  	xasprintf(&cmd, "%s %s", editor, path);
  	if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, BOX_LINES_DEFAULT,
  	    NULL, px, py, sx, sy, NULL, cmd, 0, NULL, _PATH_TMP, NULL, c, NULL,
! 	    NULL, NULL, popup_editor_close_cb, pe) != 0) {
  		popup_editor_free(pe);
  		free(cmd);
  		return (-1);