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

vt: improve logging of invalid and unimplemented sequences

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-04 19:35:01 +02:00
parent cb10d10fd8
commit befb437411
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

59
csi.c
View file

@ -252,33 +252,37 @@ csi_sgr(struct terminal *term)
return true; return true;
} }
bool static const char *
csi_dispatch(struct terminal *term, uint8_t final) csi_as_string(struct terminal *term, uint8_t final)
{ {
#if defined(_DEBUG) && defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG static char msg[1024];
char log[1024]; int c = snprintf(msg, sizeof(msg), "CSI: ");
int c = snprintf(log, sizeof(log), "CSI: ");
for (size_t i = 0; i < term->vt.intermediates.idx; i++) for (size_t i = 0; i < term->vt.intermediates.idx; i++)
c += snprintf(&log[c], sizeof(log) - c, "%c", term->vt.intermediates.data[i]); c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.intermediates.data[i]);
for (size_t i = 0; i < term->vt.params.idx; i++){ for (size_t i = 0; i < term->vt.params.idx; i++){
c += snprintf(&log[c], sizeof(log) - c, "%d", c += snprintf(&msg[c], sizeof(msg) - c, "%d",
term->vt.params.v[i].value); term->vt.params.v[i].value);
for (size_t j = 0; i < term->vt.params.v[i].sub.idx; j++) { for (size_t j = 0; i < term->vt.params.v[i].sub.idx; j++) {
c += snprintf(&log[c], sizeof(log) - c, ":%d", c += snprintf(&msg[c], sizeof(msg) - c, ":%d",
term->vt.params.v[i].sub.value[j]); term->vt.params.v[i].sub.value[j]);
} }
c += snprintf(&log[c], sizeof(log) - c, "%s", c += snprintf(&msg[c], sizeof(msg) - c, "%s",
i == term->vt.params.idx - 1 ? "" : ";"); i == term->vt.params.idx - 1 ? "" : ";");
} }
c += snprintf(&log[c], sizeof(log) - c, "%c (%d parameters)", c += snprintf(&msg[c], sizeof(msg) - c, "%c (%d parameters)",
final, term->vt.params.idx); final, term->vt.params.idx);
LOG_DBG("%s", log); return msg;
#endif }
bool
csi_dispatch(struct terminal *term, uint8_t final)
{
LOG_DBG("CSI: %s", csi_as_string(term, final));
if (term->vt.intermediates.idx == 0) { if (term->vt.intermediates.idx == 0) {
switch (final) { switch (final) {
@ -353,7 +357,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("CSI: J: invalid argument: %d", param); LOG_ERR("CSI: %s: invalid argument: %d",
csi_as_string(term, final), param);
return false; return false;
} }
@ -387,7 +392,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("CSI: K: invalid argument: %d", param); LOG_ERR("CSI: %s: invalid argument: %d",
csi_as_string(term, final), param);
return false; return false;
} }
@ -520,13 +526,14 @@ csi_dispatch(struct terminal *term, uint8_t final)
} }
default: default:
LOG_ERR("CSI: unimplemented parameter for 'n': %d", param); LOG_ERR("unimplemented: CSI: %s, parameter = %d",
csi_as_string(term, final), param);
return false; return false;
} }
return true; return true;
} else { } else {
LOG_ERR("CSI: missing parameter for 'n'"); LOG_ERR("CSI: %s: missing parameter", csi_as_string(term, final));
return false; return false;
} }
break; break;
@ -543,7 +550,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("CSI: unimplemented final: %c", final); LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort(); abort();
} }
@ -615,7 +622,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("CSI: 'h' (set mode): unimplemented param: %d", LOG_ERR("CSI: %s: unimplemented param: %d",
csi_as_string(term, final),
term->vt.params.v[i].value); term->vt.params.v[i].value);
abort(); abort();
break; break;
@ -686,7 +694,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("CSI: 'h' (unset mode): unimplemented param: %d", LOG_ERR("CSI: %s: unimplemented param: %d",
csi_as_string(term, final),
term->vt.params.v[i].value); term->vt.params.v[i].value);
abort(); abort();
break; break;
@ -705,7 +714,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("unimplemented: CSI ?%ds", term->vt.params.v[i].value); LOG_ERR("unimplemented: CSI %s", csi_as_string(term, final));
abort(); abort();
} }
} }
@ -721,14 +730,14 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("unimplemented: CSI ?%dr", term->vt.params.v[i].value); LOG_ERR("unimplemented: CSI %s", csi_as_string(term, final));
abort(); abort();
} }
} }
break; break;
default: default:
LOG_ERR("unimplemented: CSI: ?%c", final); LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort(); abort();
} }
@ -751,15 +760,13 @@ csi_dispatch(struct terminal *term, uint8_t final)
} }
default: default:
LOG_ERR("CSI: intermediate '>': unimplemented final: %c", final); LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort(); abort();
} }
} }
else { else {
LOG_ERR("CSI: unimplemented: intermediates: %.*s", LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
(int)term->vt.intermediates.idx,
term->vt.intermediates.data);
abort(); abort();
} }

31
vt.c
View file

@ -552,19 +552,24 @@ static const enum action exit_actions[] = {
[STATE_SOS_PM_APC_STRING] = ACTION_NONE, [STATE_SOS_PM_APC_STRING] = ACTION_NONE,
}; };
static const char *
esc_as_string(struct terminal *term, uint8_t final)
{
static char msg[1024];
int c = snprintf(msg, sizeof(msg), "\E");
for (size_t i = 0; i < term->vt.intermediates.idx; i++)
c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.intermediates.data[i]);
c += snprintf(&msg[c], sizeof(msg) - c, "%c", final);
return msg;
}
static bool static bool
esc_dispatch(struct terminal *term, uint8_t final) esc_dispatch(struct terminal *term, uint8_t final)
{ {
#if defined(_DEBUG) && defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG LOG_DBG("ESC: %s", esc_as_string(term, final));
char log[1024];
int c = snprintf(log, sizeof(log), "ESC: ");
for (size_t i = 0; i < term->vt.intermediates.idx; i++)
c += snprintf(&log[c], sizeof(log) - c, "%c", term->vt.intermediates.data[i]);
c += snprintf(&log[c], sizeof(log) - c, "%c", final);
LOG_DBG("%s", log);
#endif
switch (final) { switch (final) {
case '7': case '7':
@ -588,7 +593,7 @@ esc_dispatch(struct terminal *term, uint8_t final)
case '+': term->charset[3] = CHARSET_ASCII; break; case '+': term->charset[3] = CHARSET_ASCII; break;
default: default:
LOG_ERR("<ESC>%cB: invalid charset identifier", param); LOG_ERR("%s: invalid charset identifier", esc_as_string(term, final));
return false; return false;
} }
break; break;
@ -605,7 +610,7 @@ esc_dispatch(struct terminal *term, uint8_t final)
case '+': term->charset[3] = CHARSET_GRAPHIC; break; case '+': term->charset[3] = CHARSET_GRAPHIC; break;
default: default:
LOG_ERR("<ESC>%c0: invalid charset identifier", param); LOG_ERR("%s: invalid charset identifier", esc_as_string(term, final));
return false; return false;
} }
break; break;
@ -627,7 +632,7 @@ esc_dispatch(struct terminal *term, uint8_t final)
break; break;
default: default:
LOG_ERR("ESC: unimplemented final: %c", final); LOG_ERR("unimplemented: ESC: %s", esc_as_string(term, final));
return false; return false;
} }