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

performance improvements

Browse source 
* action() returns void - this gets rid of checks in vt_from_slave()
* split up ACTION_PRINT into ACTION_PRINT (ASCII) and ACTION_UTF8_PRINT
  ACTION_PRINT is on the hot path, and we want it streamlined.
* Remove run-time checkout for unimplemented state transitions, as we
  shouldn't have any of those left.
* Don't re-load current VT state on each iteration in vt_from_slave()
This commit is contained in:
Daniel Eklöf 2019-07-07 16:32:18 +02:00
parent 050f7ea6ea
commit d63629b370
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 164 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

50
csi.c
View file

@ -91,12 +91,12 @@ sgr_reset(struct terminal *term)
term->vt.attrs.background = term->background;
}
static bool
static void
csi_sgr(struct terminal *term)
{
if (term->vt.params.idx == 0) {
sgr_reset(term);
return true;
return;
}
for (size_t i = 0; i < term->vt.params.idx; i++) {
@ -162,7 +162,8 @@ csi_sgr(struct terminal *term)
i += 4;
} else {
LOG_ERR("invalid CSI SGR sequence");
return false;
abort();
break;
}
break;
}
@ -208,7 +209,8 @@ csi_sgr(struct terminal *term)
i += 4;
} else {
LOG_ERR("invalid CSI SGR sequence");
return false;
abort();
break;
}
break;
}
@ -245,11 +247,10 @@ csi_sgr(struct terminal *term)
default:
LOG_ERR("unimplemented: CSI: SGR: %u", term->vt.params.v[i].value);
return false;
abort();
break;
}
}
return true;
}
static const char *
@ -279,7 +280,7 @@ csi_as_string(struct terminal *term, uint8_t final)
return msg;
}
bool
void
csi_dispatch(struct terminal *term, uint8_t final)
{
LOG_DBG("CSI: %s", csi_as_string(term, final));
@ -287,7 +288,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
if (term->vt.intermediates.idx == 0) {
switch (final) {
case 'c':
return write(term->ptmx, "\033[?6c", 5) == 5;
write(term->ptmx, "\033[?6c", 5);
break;
case 'd': {
/* VPA - vertical line position absolute */
@ -297,7 +299,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
}
case 'm':
return csi_sgr(term);
csi_sgr(term);
break;
case 'A':
term_cursor_up(term, param_get(term, 0, 1));
@ -359,7 +362,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
default:
LOG_ERR("CSI: %s: invalid argument: %d",
csi_as_string(term, final), param);
return false;
abort();
break;
}
term_erase(term, start, end);
@ -394,7 +398,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
default:
LOG_ERR("CSI: %s: invalid argument: %d",
csi_as_string(term, final), param);
return false;
abort();
break;
}
term_erase(term, start, end);
@ -513,7 +518,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
* should provide our own terminfo with *only* \e[?1049h
* (and \e[?1049l for rmcup)
*/
LOG_WARN("ignoring CSI with final 't'");
LOG_WARN("ignoring CSI: %s", csi_as_string(term, final));
break;
case 'n': {
@ -536,13 +541,12 @@ csi_dispatch(struct terminal *term, uint8_t final)
default:
LOG_ERR("unimplemented: CSI: %s, parameter = %d",
csi_as_string(term, final), param);
return false;
abort();
break;
}
return true;
} else {
LOG_ERR("CSI: %s: missing parameter", csi_as_string(term, final));
return false;
abort();
}
break;
}
@ -561,8 +565,6 @@ csi_dispatch(struct terminal *term, uint8_t final)
LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort();
}
return true;
}
else if (term->vt.intermediates.idx == 1 &&
@ -746,8 +748,6 @@ csi_dispatch(struct terminal *term, uint8_t final)
LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort();
}
return true;
}
else if (term->vt.intermediates.idx == 1 &&
@ -759,10 +759,12 @@ csi_dispatch(struct terminal *term, uint8_t final)
LOG_ERR(
"unimplemented: send device attributes with param = %d",
param);
return false;
abort();
break;
}
return write(term->ptmx, "\033[?6c", 5) == 5;
write(term->ptmx, "\033[?6c", 5);
break;
}
default:
@ -775,6 +777,4 @@ csi_dispatch(struct terminal *term, uint8_t final)
LOG_ERR("unimplemented: CSI: %s", csi_as_string(term, final));
abort();
}
return false;
}