diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-12-16 13:30:49 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-12-16 13:30:49 +0000 |
| commit | 2e137c0a7e747a781ec311c6aad656873072b96c (patch) | |
| tree | dfb88ab3dc57a2efabb4335a84ce24695fdcd7a6 /csi.c | |
| parent | csi: implement DECRQM (DEC modes), for real (diff) | |
vt: don’t ignore extra private/intermediate characters
Take ‘\E(#0’ for example - this is *not* the same as ‘\E(0’.
Up until now, foot has however treated them as the same escape,
because the handler for ‘\E(0’ didn’t verify there weren’t any _other_
private characters present.
Fix this by turning the ‘private’ array into a single 4-byte
integer. This allows us to match *all* privates with a single
comparison.
Private characters are added to the LSB first, and MSB last. This
means we can check for single privates in pretty much the same way as
before:
switch (term->vt.private) {
case ‘?’:
...
break;
}
Checking for two (or more) is much uglier, but foot only supports
a *single* escape with two privates, and no escapes with three or
more:
switch (term->vt.private) {
case 0x243f: /* ‘?$’ */
...
break;
}
The ‘clear’ action remains simple (and fast), with a single write
operation.
Collecting privates is potentially _slightly_ more complex than
before; we now need mask and compare, instead of simply comparing,
when checking how many privates we already have.
We _could_ add a counter, which would make collecting privates easier,
but this would add an additional write to the ‘clean’ action which is
really bad since it’s in the hot path.
Diffstat (limited to 'csi.c')
| -rw-r--r-- | csi.c | 88 |
1 files changed, 47 insertions, 41 deletions
@@ -57,10 +57,11 @@ csi_as_string(struct terminal *term, uint8_t final, int idx) i == term->vt.params.idx - 1 ? "" : ";"); } - for (size_t i = 0; i < sizeof(term->vt.private) / sizeof(term->vt.private[0]); i++) { - if (term->vt.private[i] == 0) + for (size_t i = 0; i < sizeof(term->vt.private); i++) { + char value = (term->vt.private >> (i * 8)) & 0xff; + if (value == 0) break; - c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.private[i]); + c += snprintf(&msg[c], sizeof(msg) - c, "%c", value); } snprintf(&msg[c], sizeof(msg) - c, "%c (%u parameters)", @@ -673,9 +674,9 @@ xtrestore(struct terminal *term, unsigned param) void csi_dispatch(struct terminal *term, uint8_t final) { - LOG_DBG("%s", csi_as_string(term, final, -1)); + LOG_DBG("%s (%08x)", csi_as_string(term, final, -1), term->vt.private); - switch (term->vt.private[0]) { + switch (term->vt.private) { case 0: { switch (final) { case 'b': @@ -1361,7 +1362,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - break; /* private == 0 */ + break; /* private[0] == 0 */ } case '?': { @@ -1378,36 +1379,6 @@ csi_dispatch(struct terminal *term, uint8_t final) decrst(term, term->vt.params.v[i].value); break; - case 'p': { - if (term->vt.private[1] != '$') { - UNHANDLED(); - break; - } - - unsigned param = vt_param_get(term, 0, 0); - - /* - * Request DEC private mode (DECRQM) - * Reply: - * 0 - not recognized - * 1 - set - * 2 - reset - * 3 - permanently set - * 4 - permantently reset - */ - bool enabled; - unsigned value; - if (decrqm(term, param, &enabled)) - value = enabled ? 1 : 2; - else - value = 0; - - char reply[32]; - snprintf(reply, sizeof(reply), "\033[?%u;%u$y", param, value); - term_to_slave(term, reply, strlen(reply)); - break; - } - case 's': for (size_t i = 0; i < term->vt.params.idx; i++) xtsave(term, term->vt.params.v[i].value); @@ -1456,7 +1427,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - break; /* private == '?' */ + break; /* private[0] == '?' */ } case '>': { @@ -1542,7 +1513,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - break; /* private == '>' */ + break; /* private[0] == '>' */ } case ' ': { @@ -1587,7 +1558,7 @@ csi_dispatch(struct terminal *term, uint8_t final) UNHANDLED(); break; } - break; /* private == ' ' */ + break; /* private[0] == ' ' */ } case '!': { @@ -1600,7 +1571,7 @@ csi_dispatch(struct terminal *term, uint8_t final) UNHANDLED(); break; } - break; /* private == '!' */ + break; /* private[0] == '!' */ } case '=': { @@ -1629,9 +1600,44 @@ csi_dispatch(struct terminal *term, uint8_t final) UNHANDLED(); break; } - break; /* private == '=' */ + break; /* private[0] == '=' */ } + case 0x243f: /* ?$ */ + switch (final) { + case 'p': { + unsigned param = vt_param_get(term, 0, 0); + + /* + * Request DEC private mode (DECRQM) + * Reply: + * 0 - not recognized + * 1 - set + * 2 - reset + * 3 - permanently set + * 4 - permantently reset + */ + bool enabled; + unsigned value; + if (decrqm(term, param, &enabled)) + value = enabled ? 1 : 2; + else + value = 0; + + char reply[32]; + snprintf(reply, sizeof(reply), "\033[?%u;%u$y", param, value); + term_to_slave(term, reply, strlen(reply)); + break; + + } + + default: + UNHANDLED(); + break; + } + + break; /* private[0] == ‘?’ && private[1] == ‘$’ */ + default: UNHANDLED(); break; |
