Merge branch 'obsd-master' into master

1 files changed, 11 insertions, 3 deletions

diff --git a/popup.c b/popup.c
index 0edf76e4..7616d5ca 100644
--- a/popup.c
+++ b/popup.c
@@ -211,16 +211,22 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
 	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);
+		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);
@@ -228,8 +234,10 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
 	screen_write_stop(&ctx);
 
 	memcpy(&gc, &grid_default_cell, sizeof gc);
-	gc.fg = pd->palette.fg;
-	gc.bg = pd->palette.bg;
+	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;