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

terminal: remove 'blink' attribute from cell struct

Browse source 
This makes the other attribute bits fit in a single uint8_t, which
makes each cell smaller which improves cache usage.
This commit is contained in:
Daniel Eklöf 2019-07-10 18:45:12 +02:00
parent 5a92202a49
commit cf71534768
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

61
csi.c
View file

@ -79,6 +79,33 @@ sgr_reset(struct terminal *term)
term->vt.attrs.background = term->background; term->vt.attrs.background = term->background;
} }
static const char *
csi_as_string(struct terminal *term, uint8_t final)
{
static char msg[1024];
int c = snprintf(msg, sizeof(msg), "CSI: ");
if (term->vt.private != 0)
c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.private);
for (size_t i = 0; i < term->vt.params.idx; i++){
c += snprintf(&msg[c], sizeof(msg) - c, "%d",
term->vt.params.v[i].value);
for (size_t j = 0; i < term->vt.params.v[i].sub.idx; j++) {
c += snprintf(&msg[c], sizeof(msg) - c, ":%d",
term->vt.params.v[i].sub.value[j]);
}
c += snprintf(&msg[c], sizeof(msg) - c, "%s",
i == term->vt.params.idx - 1 ? "" : ";");
}
c += snprintf(&msg[c], sizeof(msg) - c, "%c (%zu parameters)",
final, term->vt.params.idx);
return msg;
}
static void static void
csi_sgr(struct terminal *term) csi_sgr(struct terminal *term)
{ {
@ -99,8 +126,8 @@ csi_sgr(struct terminal *term)
case 2: term->vt.dim = true; break; case 2: term->vt.dim = true; break;
case 3: term->vt.attrs.italic = true; break; case 3: term->vt.attrs.italic = true; break;
case 4: term->vt.attrs.underline = true; break; case 4: term->vt.attrs.underline = true; break;
case 5: term->vt.attrs.blink = true; break; case 5: LOG_WARN("unimplemented: %s (blink)", csi_as_string(term, 'm')); /*term->vt.attrs.blink = true; */break;
case 6: term->vt.attrs.blink = true; break; case 6: break; /* rapid blink, ignored */
case 7: term->vt.attrs.reverse = true; break; case 7: term->vt.attrs.reverse = true; break;
case 8: term->vt.attrs.conceal = true; break; case 8: term->vt.attrs.conceal = true; break;
case 9: term->vt.attrs.strikethrough = true; break; case 9: term->vt.attrs.strikethrough = true; break;
@ -108,7 +135,8 @@ csi_sgr(struct terminal *term)
case 22: term->vt.attrs.bold = term->vt.dim = false; break; case 22: term->vt.attrs.bold = term->vt.dim = false; break;
case 23: term->vt.attrs.italic = false; break; case 23: term->vt.attrs.italic = false; break;
case 24: term->vt.attrs.underline = false; break; case 24: term->vt.attrs.underline = false; break;
case 25: term->vt.attrs.blink = false; break; case 25: /*term->vt.attrs.blink = false; */break;
case 26: break; /* rapid blink, ignored */
case 27: term->vt.attrs.reverse = false; break; case 27: term->vt.attrs.reverse = false; break;
case 28: term->vt.attrs.conceal = false; break; case 28: term->vt.attrs.conceal = false; break;
case 29: term->vt.attrs.strikethrough = false; break; case 29: term->vt.attrs.strikethrough = false; break;
@ -239,33 +267,6 @@ csi_sgr(struct terminal *term)
} }
} }
static const char *
csi_as_string(struct terminal *term, uint8_t final)
{
static char msg[1024];
int c = snprintf(msg, sizeof(msg), "CSI: ");
if (term->vt.private != 0)
c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.private);
for (size_t i = 0; i < term->vt.params.idx; i++){
c += snprintf(&msg[c], sizeof(msg) - c, "%d",
term->vt.params.v[i].value);
for (size_t j = 0; i < term->vt.params.v[i].sub.idx; j++) {
c += snprintf(&msg[c], sizeof(msg) - c, ":%d",
term->vt.params.v[i].sub.value[j]);
}
c += snprintf(&msg[c], sizeof(msg) - c, "%s",
i == term->vt.params.idx - 1 ? "" : ";");
}
c += snprintf(&msg[c], sizeof(msg) - c, "%c (%zu parameters)",
final, term->vt.params.idx);
return msg;
}
void void
csi_dispatch(struct terminal *term, uint8_t final) csi_dispatch(struct terminal *term, uint8_t final)
{ {

2
terminal.h
View file

@ -56,7 +56,7 @@ struct attributes {
uint8_t italic:1; uint8_t italic:1;
uint8_t underline:1; uint8_t underline:1;
uint8_t strikethrough:1; uint8_t strikethrough:1;
uint8_t blink:1; //uint8_t blink:1; /* Not supported yet, and removing it means all other attributes fit in a single uint8_t */
uint8_t conceal:1; uint8_t conceal:1;
uint8_t reverse:1; uint8_t reverse:1;
uint8_t have_foreground:1; uint8_t have_foreground:1;