terminal: move fore/background colors from grid to terminal

This commit is contained in:
Daniel Eklöf 2019-06-29 21:09:58 +02:00
parent 3d2ab03f62
commit 8723098cda
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 11 additions and 12 deletions

10
main.c
View file

@ -104,9 +104,9 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d
int height = c->term.cell_height;
struct rgba foreground = cell->attrs.have_foreground
? cell->attrs.foreground : c->term.grid.foreground;
? cell->attrs.foreground : c->term.foreground;
struct rgba background = cell->attrs.have_background
? cell->attrs.background : c->term.grid.background;
? cell->attrs.background : c->term.background;
if (has_cursor) {
struct rgba swap = foreground;
@ -743,9 +743,7 @@ main(int argc, const char *const *argv)
.vt = {
.state = 1, /* STATE_GROUND */
},
.grid = {.foreground = default_foreground,
.background = default_background,
.damage = tll_init()},
.grid = {.damage = tll_init()},
.kbd = {
.repeat = {
.pipe_read_fd = repeat_pipe_fds[0],
@ -753,6 +751,8 @@ main(int argc, const char *const *argv)
.cmd = REPEAT_STOP,
},
},
.foreground = default_foreground,
.background = default_background,
},
};