mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-06 01:40:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

terminal: move fore/background colors from grid to terminal

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
csi.c
View file

@ -92,8 +92,8 @@ sgr_reset(struct terminal *term)
{
memset(&term->vt.attrs, 0, sizeof(term->vt.attrs));
term->vt.dim = false;
term->vt.attrs.foreground = term->grid.foreground;
term->vt.attrs.background = term->grid.background;
term->vt.attrs.foreground = term->foreground;
term->vt.attrs.background = term->background;
}
static bool
@ -172,7 +172,7 @@ csi_sgr(struct terminal *term)
break;
}
case 39:
term->vt.attrs.foreground = term->grid.foreground;
term->vt.attrs.foreground = term->foreground;
term->vt.attrs.have_foreground = false;
break;
@ -218,7 +218,7 @@ csi_sgr(struct terminal *term)
break;
}
case 49:
term->vt.attrs.background = term->grid.background;
term->vt.attrs.background = term->background;
term->vt.attrs.have_background = false;
break;

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,
},
};

5
terminal.h
View file

@ -71,9 +71,6 @@ struct grid {
int col;
} alt_saved_cursor;
struct rgba foreground;
struct rgba background;
tll(struct damage) damage;
tll(struct damage) scroll_damage;
};
@ -152,6 +149,8 @@ struct terminal {
struct scroll_region scroll_region;
struct rgba foreground;
struct rgba background;
};
void term_damage_all(struct terminal *term);