Instead of setting the popup default colours in the draw callback, set

it up in popup_display and follow the same routine as panes in the draw
and init_ctx callbacks - use the palette if the option value is default.
Allows application-set fg and bg to work in panes again.

diff --git a/usr.bin/tmux/popup.c b/usr.bin/tmux/popup.c
index c6939c3..865c829 100644 (file)
--- a/usr.bin/tmux/popup.c
+++ b/usr.bin/tmux/popup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popup.c,v 1.40 2021/10/20 09:52:27 nicm Exp $ */
+/* $OpenBSD: popup.c,v 1.41 2021/10/25 09:22:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -31,11 +31,15 @@ struct popup_data {
        struct client            *c;
        struct cmdq_item         *item;
        int                       flags;
-       enum box_lines            lines;
        char                     *title;
 
+       struct grid_cell          border_cell;
+       enum box_lines            border_lines;
+
        struct screen             s;
+       struct grid_cell          defaults;
        struct colour_palette     palette;
+
        struct job               *job;
        struct input_ctx         *ictx;
        int                       status;
@@ -119,7 +123,7 @@ popup_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
        ttyctx->wsx = c->tty.sx;
        ttyctx->wsy = c->tty.sy;
 
-       if (pd->lines == BOX_LINES_NONE) {
+       if (pd->border_lines == BOX_LINES_NONE) {
                ttyctx->xoff = ttyctx->rxoff = pd->px;
                ttyctx->yoff = ttyctx->ryoff = pd->py;
        } else {
@@ -135,6 +139,7 @@ popup_init_ctx_cb(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx)
 {
        struct popup_data       *pd = ctx->arg;
 
+       memcpy(&ttyctx->defaults, &pd->defaults, sizeof ttyctx->defaults);
        ttyctx->palette = &pd->palette;
        ttyctx->redraw_cb = popup_redraw_cb;
        ttyctx->set_client_cb = popup_set_client_cb;
@@ -149,7 +154,7 @@ popup_mode_cb(__unused struct client *c, void *data, u_int *cx, u_int *cy)
        if (pd->md != NULL)
                return (menu_mode_cb(c, pd->md, cx, cy));
 
-       if (pd->lines == BOX_LINES_NONE) {
+       if (pd->border_lines == BOX_LINES_NONE) {
                *cx = pd->px + pd->s.cx;
                *cy = pd->py + pd->s.cy;
        } else {
@@ -213,36 +218,29 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
        struct screen_write_ctx  ctx;
        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;
+       struct grid_cell         defaults;
 
        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);
-       bgc.attr = 0;
-       style_apply(&bgc, o, "popup-border-style", NULL);
-       bgc.attr = 0;
-
-       if (pd->lines == BOX_LINES_NONE) {
+       if (pd->border_lines == BOX_LINES_NONE) {
                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, pd->lines, &bgc,
-                   pd->title);
+               screen_write_box(&ctx, pd->sx, pd->sy, pd->border_lines,
+                   &pd->border_cell, pd->title);
                screen_write_cursormove(&ctx, 1, 1, 0);
                screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2,
                    pd->sy - 2);
        }
        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;
+       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) {
                c->overlay_check = menu_check_cb;
@@ -251,8 +249,10 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
                c->overlay_check = NULL;
                c->overlay_data = NULL;
        }
-       for (i = 0; i < pd->sy; i++)
-               tty_draw_line(tty, &s, 0, i, pd->sx, px, py + i, &gc, palette);
+       for (i = 0; i < pd->sy; i++) {
+               tty_draw_line(tty, &s, 0, i, pd->sx, px, py + i, &defaults,
+                   palette);
+       }
        if (pd->md != NULL) {
                c->overlay_check = NULL;
                c->overlay_data = NULL;
@@ -323,7 +323,7 @@ popup_resize_cb(__unused struct client *c, void *data)
                pd->px = pd->ppx;
 
        /* Avoid zero size screens. */
-       if (pd->lines == BOX_LINES_NONE) {
+       if (pd->border_lines == BOX_LINES_NONE) {
                screen_resize(&pd->s, pd->sx, pd->sy, 0);
                if (pd->job != NULL)
                        job_resize(pd->job, pd->sx, pd->sy );
@@ -449,7 +449,7 @@ popup_handle_drag(struct client *c, struct popup_data *pd,
                pd->ppy = py;
                server_redraw_client(c);
        } else if (pd->dragging == SIZE) {
-               if (pd->lines == BOX_LINES_NONE) {
+               if (pd->border_lines == BOX_LINES_NONE) {
                        if (m->x < pd->px + 1)
                                return;
                        if (m->y < pd->py + 1)
@@ -465,7 +465,7 @@ popup_handle_drag(struct client *c, struct popup_data *pd,
                pd->psx = pd->sx;
                pd->psy = pd->sy;
 
-               if (pd->lines == BOX_LINES_NONE) {
+               if (pd->border_lines == BOX_LINES_NONE) {
                        screen_resize(&pd->s, pd->sx, pd->sy, 0);
                        if (pd->job != NULL)
                                job_resize(pd->job, pd->sx, pd->sy);
@@ -513,7 +513,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
                                goto menu;
                        return (0);
                }
-               if (pd->lines != BOX_LINES_NONE) {
+               if (pd->border_lines != BOX_LINES_NONE) {
                        if (m->x == pd->px)
                                border = LEFT;
                        else if (m->x == pd->px + pd->sx - 1)
@@ -547,7 +547,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
        if (pd->job != NULL) {
                if (KEYC_IS_MOUSE(event->key)) {
                        /* Must be inside, checked already. */
-                       if (pd->lines == BOX_LINES_NONE) {
+                       if (pd->border_lines == BOX_LINES_NONE) {
                                px = m->x - pd->px;
                                py = m->y - pd->py;
                        } else {
@@ -642,13 +642,13 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
        u_int                    jx, jy;
        struct options          *o;
 
-       if (lines == BOX_LINES_DEFAULT) {
-               if (s != NULL)
-                       o = s->curw->window->options;
-               else
-                       o = c->session->curw->window->options;
+       if (s != NULL)
+               o = s->curw->window->options;
+       else
+               o = c->session->curw->window->options;
+
+       if (lines == BOX_LINES_DEFAULT)
                lines = options_get_number(o, "popup-border-lines");
-       }
        if (lines == BOX_LINES_NONE) {
                if (sx < 1 || sy < 1)
                        return (-1);
@@ -666,7 +666,6 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
        pd = xcalloc(1, sizeof *pd);
        pd->item = item;
        pd->flags = flags;
-       pd->lines = lines;
        pd->title = xstrdup(title);
 
        pd->c = c;
@@ -676,10 +675,19 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
        pd->arg = arg;
        pd->status = 128 + SIGHUP;
 
+       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);
+       pd->border_cell.attr = 0;
+
        screen_init(&pd->s, sx - 2, sy - 2, 0);
        colour_palette_init(&pd->palette);
        colour_palette_from_option(&pd->palette, global_w_options);
 
+       memcpy(&pd->defaults, &grid_default_cell, sizeof pd->defaults);
+       style_apply(&pd->defaults, o, "popup-style", NULL);
+       pd->defaults.attr = 0;
+
        pd->px = px;
        pd->py = py;
        pd->sx = sx;

diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 4318403..8005043 100644 (file)
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.202 2021/10/20 09:50:40 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.203 2021/10/25 09:22:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -184,8 +184,10 @@ screen_write_initctx(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
        if (ctx->init_ctx_cb != NULL) {
                ctx->init_ctx_cb(ctx, ttyctx);
                if (ttyctx->palette != NULL) {
-                       ttyctx->defaults.fg = ttyctx->palette->fg;
-                       ttyctx->defaults.bg = ttyctx->palette->bg;
+                       if (COLOUR_DEFAULT(ttyctx->defaults.fg))
+                               ttyctx->defaults.fg = ttyctx->palette->fg;
+                       if (COLOUR_DEFAULT(ttyctx->defaults.bg))
+                               ttyctx->defaults.bg = ttyctx->palette->bg;
                }
        } else {
                ttyctx->redraw_cb = screen_write_redraw_cb;

diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 8f06227..c799c67 100644 (file)
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.407 2021/10/14 09:54:51 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.408 2021/10/25 09:22:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1972,10 +1972,9 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
                for (i = 0; i < OVERLAY_MAX_RANGES; i++)
                        vis += r.nx[i];
                if (vis < gcp->data.width) {
-                       tty_draw_line(tty, s, s->cx, s->cy,
-                                   gcp->data.width, px, py, &ctx->defaults,
-                                   ctx->palette);
-                               return;
+                       tty_draw_line(tty, s, s->cx, s->cy, gcp->data.width,
+                           px, py, &ctx->defaults, ctx->palette);
+                       return;
                }
        }