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

vt: convert CSI entry from table lookup to switch

Browse source
This commit is contained in:
Daniel Eklöf 2019-12-20 20:57:38 +01:00
parent a5f238b388
commit b1fd960b4b
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
vt.c
View file

@ -229,7 +229,6 @@ static const struct state_transition state_escape_intermediate[256] = {
[0x9d] = { .state = STATE_OSC_STRING}, [0x9d] = { .state = STATE_OSC_STRING},
[0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING}, [0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING},
}; };
#endif
static const struct state_transition state_csi_entry[256] = { static const struct state_transition state_csi_entry[256] = {
[0x00 ... 0x17] = {.action = ACTION_EXECUTE}, [0x00 ... 0x17] = {.action = ACTION_EXECUTE},
@ -257,6 +256,7 @@ static const struct state_transition state_csi_entry[256] = {
[0x9d] = { .state = STATE_OSC_STRING}, [0x9d] = { .state = STATE_OSC_STRING},
[0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING}, [0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING},
}; };
#endif
static const struct state_transition state_csi_param[256] = { static const struct state_transition state_csi_param[256] = {
[0x00 ... 0x17] = {.action = ACTION_EXECUTE}, [0x00 ... 0x17] = {.action = ACTION_EXECUTE},
@ -1173,6 +1173,41 @@ state_escape_intermediate_switch(struct terminal *term, uint8_t data)
} }
} }
static enum state
state_csi_entry_switch(struct terminal *term, uint8_t data)
{
switch (data) {
/* exit current enter new state */
case 0x00 ... 0x17:
case 0x19:
case 0x1c ... 0x1f: action(term, ACTION_EXECUTE, data); return STATE_CSI_ENTRY;
case 0x20 ... 0x2f: action(term, ACTION_COLLECT, data); return STATE_CSI_INTERMEDIATE;
case 0x30 ... 0x39: action(term, ACTION_PARAM, data); return STATE_CSI_PARAM;
case 0x3a ... 0x3b: return STATE_CSI_PARAM;
case 0x3c ... 0x3f: action(term, ACTION_COLLECT, data); return STATE_CSI_PARAM;
case 0x40 ... 0x7e: action(term, ACTION_CSI_DISPATCH, data); return STATE_GROUND;
case 0x7f: action(term, ACTION_IGNORE, data); return STATE_CSI_ENTRY;
/* Anywhere */
case 0x18: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x1a: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x1b: action(term, ACTION_CLEAR, data); return STATE_ESCAPE;
case 0x80 ... 0x8f: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x90: action(term, ACTION_CLEAR, data); return STATE_DCS_ENTRY;
case 0x91 ... 0x97: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x98: return STATE_SOS_PM_APC_STRING;
case 0x99: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x9a: action(term, ACTION_EXECUTE, data); return STATE_GROUND;
case 0x9b: action(term, ACTION_CLEAR, data); return STATE_CSI_ENTRY;
case 0x9c: return STATE_GROUND;
case 0x9d: action(term, ACTION_OSC_START, data); return STATE_OSC_STRING;
case 0x9e ... 0x9f: return STATE_SOS_PM_APC_STRING;
default: return STATE_CSI_ENTRY;
}
}
void void
vt_from_slave(struct terminal *term, const uint8_t *data, size_t len) vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
{ {
@ -1191,10 +1226,10 @@ vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
const struct state_transition *table = NULL; const struct state_transition *table = NULL;
switch (current_state) { switch (current_state) {
case STATE_GROUND: term->vt.state = current_state = state_ground_switch(term, data[i]); continue; case STATE_GROUND: term->vt.state = current_state = state_ground_switch(term, data[i]); continue;
case STATE_ESCAPE: term->vt.state = current_state = state_escape_switch(term, data[i]); continue; case STATE_ESCAPE: term->vt.state = current_state = state_escape_switch(term, data[i]); continue;
case STATE_ESCAPE_INTERMEDIATE: term->vt.state = current_state = state_escape_intermediate_switch(term, data[i]); continue; case STATE_ESCAPE_INTERMEDIATE: term->vt.state = current_state = state_escape_intermediate_switch(term, data[i]); continue;
case STATE_CSI_ENTRY: table = state_csi_entry; break; case STATE_CSI_ENTRY: term->vt.state = current_state = state_csi_entry_switch(term, data[i]); continue;
case STATE_CSI_PARAM: table = state_csi_param; break; case STATE_CSI_PARAM: table = state_csi_param; break;
case STATE_CSI_INTERMEDIATE: table = state_csi_intermediate; break; case STATE_CSI_INTERMEDIATE: table = state_csi_intermediate; break;
case STATE_CSI_IGNORE: table = state_csi_ignore; break; case STATE_CSI_IGNORE: table = state_csi_ignore; break;