aboutsummaryrefslogtreecommitdiff
path: root/vt.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-16 13:30:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-16 13:30:49 +0000
commit2e137c0a7e747a781ec311c6aad656873072b96c (patch)
treedfb88ab3dc57a2efabb4335a84ce24695fdcd7a6 /vt.c
parentcsi: 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 'vt.c')
-rw-r--r--vt.c40
1 files changed, 27 insertions, 13 deletions
diff --git a/vt.c b/vt.c
index ed26da73..37b80eec 100644
--- a/vt.c
+++ b/vt.c
@@ -82,10 +82,11 @@ 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 < 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);
}
assert(term->vt.params.idx == 0);
@@ -105,8 +106,7 @@ static void
action_clear(struct terminal *term)
{
term->vt.params.idx = 0;
- term->vt.private[0] = 0;
- term->vt.private[1] = 0;
+ term->vt.private = 0;
}
static void
@@ -335,12 +335,26 @@ static void
action_collect(struct terminal *term, uint8_t c)
{
LOG_DBG("collect: %c", c);
- if (term->vt.private[0] == 0)
- term->vt.private[0] = c;
- else if (term->vt.private[1] == 0)
- term->vt.private[1] = c;
+
+ /*
+ * Having more than one private is *very* rare. Foot ony supports
+ * a *single* escape with two privates, and none with three or
+ * more.
+ *
+ * As such, we optimize *reading* the private(s), and *resetting*
+ * them (in action_clear()). Writing is ok if it’s a bit slow.
+ */
+
+ if ((term->vt.private & 0xff) == 0)
+ term->vt.private = c;
+ else if (((term->vt.private >> 8) & 0xff) == 0)
+ term->vt.private |= c << 8;
+ else if (((term->vt.private >> 16) & 0xff) == 0)
+ term->vt.private |= c << 16;
+ else if (((term->vt.private >> 24) & 0xff) == 0)
+ term->vt.private |= c << 24;
else
- LOG_WARN("only two private/intermediate characters supported");
+ LOG_WARN("only four private/intermediate characters supported");
}
static void
@@ -348,7 +362,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final)
{
LOG_DBG("ESC: %s", esc_as_string(term, final));
- switch (term->vt.private[0]) {
+ switch (term->vt.private) {
case 0:
switch (final) {
case '7':
@@ -425,7 +439,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final)
case '+':
switch (final) {
case '0': {
- char priv = term->vt.private[0];
+ char priv = term->vt.private;
ssize_t idx = priv ==
'(' ? 0 :
')' ? 1 :
@@ -437,7 +451,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final)
}
case 'B': {
- char priv = term->vt.private[0];
+ char priv = term->vt.private;
ssize_t idx = priv ==
'(' ? 0 :
')' ? 1 :