From 1f8256fc508bbee24b53fcd588ebf74653d69dfa Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 28 Apr 2020 13:50:07 +0100 Subject: Drop having a separate type for style options and make them all strings, which allows formats to be expanded. Any styles without a '#{' are still validated when they are set but any with a '#{' are not. Formats are not expanded usefully in many cases yet, that will be changed later. To make this work, a few other changes: - set-option -a with a style option automatically appends a ",". - OSC 10 and 11 don't set the window-style option anymore, instead the fg and bg are stored in the pane struct and act as the defaults that can be overridden by window-style. - status-fg and -bg now override status-style instead of trying to keep them in sync. --- menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index fd744e7d..2f92af34 100644 --- a/menu.c +++ b/menu.c @@ -151,8 +151,7 @@ menu_draw_cb(struct client *c, __unused struct screen_redraw_ctx *ctx0) u_int i, px = md->px, py = md->py; struct grid_cell gc; - memcpy(&gc, &grid_default_cell, sizeof gc); - style_apply(&gc, c->session->curw->window->options, "mode-style"); + style_apply(&gc, c->session->curw->window->options, "mode-style", NULL); screen_write_start(&ctx, NULL, s); screen_write_clearscreen(&ctx, 8); -- cgit