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

csi: move 256-color table into the terminal struct

Browse source
This commit is contained in:
Daniel Eklöf 2019-08-21 17:56:21 +02:00
parent 3efc30c6a1
commit d7aaeaedee
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

29
csi.c
View file

@ -18,34 +18,9 @@
#define min(x, y) ((x) < (y) ? (x) : (y))
static uint32_t colors256[256];
#define UNHANDLED() LOG_ERR("unhandled: %s", csi_as_string(term, final))
#define UNHANDLED_SGR() LOG_ERR("unhandled: %s", csi_as_string(term, 'm'))
static void __attribute__((constructor))
initialize_colors256(void)
{
#if 0 /* pick colors from term struct instead, since they can be changed runtime */
for (size_t i = 0; i < 8; i++)
colors256[i] = colors_regular[i];
for (size_t i = 0; i < 8; i++)
colors256[8 + i] = colors_bright[i];
#endif
for (size_t r = 0; r < 6; r++) {
for (size_t g = 0; g < 6; g++) {
for (size_t b = 0; b < 6; b++) {
colors256[16 + r * 6 * 6 + g * 6 + b]
= r * 51 << 16 | g * 51 << 8 | b * 51;
}
}
}
for (size_t i = 0; i < 24; i++)
colors256[232 + i] = i * 11 << 16 | i * 11 << 8 | i * 11;
}
static void
sgr_reset(struct terminal *term)
{
@ -144,7 +119,7 @@ csi_sgr(struct terminal *term)
else if (idx < 16)
color = term->colors.bright[idx - 8];
else
color = colors256[idx];
color = term->colors.colors256[idx];
term->vt.attrs.have_fg = 1;
term->vt.attrs.fg = color;
i += 2;
@ -215,7 +190,7 @@ csi_sgr(struct terminal *term)
else if (idx < 16)
color = term->colors.bright[idx - 8];
else
color = colors256[idx];
color = term->colors.colors256[idx];
term->vt.attrs.have_bg = 1;
term->vt.attrs.bg = color;
i += 2;

24
main.c
View file

@ -493,6 +493,30 @@ main(int argc, char *const *argv)
},
};
/* Initialize the 256 gray-scale color cube */
{
#if 0 /* pick colors from term struct instead, since they can be changed runtime */
for (size_t i = 0; i < 8; i++)
term.colors.default_colors256[i] = term.colors.default_regular[i];
for (size_t i = 0; i < 8; i++)
term.colors.default_colors256[8 + i] = term.colors.default_bright[i];
#endif
for (size_t r = 0; r < 6; r++) {
for (size_t g = 0; g < 6; g++) {
for (size_t b = 0; b < 6; b++) {
term.colors.default_colors256[16 + r * 6 * 6 + g * 6 + b]
= r * 51 << 16 | g * 51 << 8 | b * 51;
}
}
}
for (size_t i = 0; i < 24; i++)
term.colors.default_colors256[232 + i] = i * 11 << 16 | i * 11 << 8 | i * 11;
memcpy(term.colors.colors256, term.colors.default_colors256, sizeof(term.colors.colors256));
}
LOG_INFO("using %zu rendering threads", term.render.workers.count);
struct render_worker_context worker_context[term.render.workers.count];

2
terminal.c
View file

@ -65,6 +65,8 @@ term_reset(struct terminal *term, bool hard)
term->colors.regular[i] = term->colors.default_regular[i];
term->colors.bright[i] = term->colors.default_bright[i];
}
for (size_t i = 0; i < 256; i++)
term->colors.colors256[i] = term->colors.default_colors256[i];
term->print_needs_wrap = false;
term->cursor = (struct coord){0, 0};
term->saved_cursor = (struct coord){0, 0};

2
terminal.h
View file

@ -287,12 +287,14 @@ struct terminal {
uint32_t bg;
uint32_t regular[8];
uint32_t bright[8];
uint32_t colors256[256];
double alpha;
uint32_t default_fg;
uint32_t default_bg;
uint32_t default_regular[8];
uint32_t default_bright[8];
uint32_t default_colors256[256];
} colors;
struct {