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

term: use colors256 array for *all* colors

Browse source 
That is, remove the 'regular' and 'bright' color arrays. This is
possible since the 256-color array is defined such that the first 16
colors map to the regular and bright colors.
This commit is contained in:
Daniel Eklöf 2019-08-21 18:47:48 +02:00
parent 65e4b93a03
commit 631e0c0870
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 22 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

34
osc.c
View file

@ -291,11 +291,7 @@ osc_dispatch(struct terminal *term)
/* Client queried for current value */
if (strlen(string) == 1 && string[0] == '?') {
uint32_t color =
(idx >= 0 && idx < 8) ? term->colors.regular[idx] :
(idx >= 8 && idx < 16) ? term->colors.bright[idx - 8] :
term->colors.colors256[idx];
uint32_t color = term->colors.colors256[idx];
uint8_t r = (color >> 16) & 0xff;
uint8_t g = (color >> 8) & 0xff;
uint8_t b = (color >> 0) & 0xff;
@ -311,13 +307,7 @@ osc_dispatch(struct terminal *term)
if (!parse_rgb(string, &color))
break;
if (idx >= 0 && idx < 8)
term->colors.regular[idx] = color;
else if (idx >= 8 && idx < 16)
term->colors.bright[idx - 8] = color;
else
term->colors.colors256[idx] = color;
term->colors.colors256[idx] = color;
render_refresh(term);
break;
}
@ -373,11 +363,7 @@ osc_dispatch(struct terminal *term)
/* Reset Color Number 'c' (whole table if no parameter) */
if (strlen(string) == 0) {
for (size_t i = 0; i < 8; i++) {
term->colors.regular[i] = term->colors.default_regular[i];
term->colors.bright[i] = term->colors.default_bright[i];
}
for (size_t i = 16; i < 256; i++)
for (size_t i = 0; i < 256; i++)
term->colors.colors256[i] = term->colors.default_colors256[i];
} else {
unsigned idx = 0;
@ -385,12 +371,7 @@ osc_dispatch(struct terminal *term)
for (; *string != '\0'; string++) {
char c = *string;
if (c == ';') {
if (idx >= 0 && idx < 8)
term->colors.regular[idx] = term->colors.default_regular[idx];
else if (idx >= 8 && idx < 16)
term->colors.bright[idx - 8] = term->colors.default_bright[idx - 8];
else if (idx < 256)
term->colors.colors256[idx] = term->colors.default_colors256[idx];
term->colors.colors256[idx] = term->colors.default_colors256[idx];
idx = 0;
continue;
}
@ -399,12 +380,7 @@ osc_dispatch(struct terminal *term)
idx += c - '0';
}
if (idx >= 0 && idx < 8)
term->colors.regular[idx] = term->colors.default_regular[idx];
else if (idx >= 8 && idx < 16)
term->colors.bright[idx - 8] = term->colors.default_bright[idx - 8];
else if (idx < 256)
term->colors.colors256[idx] = term->colors.default_colors256[idx];
term->colors.colors256[idx] = term->colors.default_colors256[idx];
}
render_refresh(term);