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

vt: convert CSI ignore from table lookup to switch

Browse source
This commit is contained in:
Daniel Eklöf 2019-12-20 21:13:06 +01:00
parent 0d6555bea9
commit dca403e100
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

36
vt.c
View file

@ -308,7 +308,6 @@ static const struct state_transition state_csi_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_ignore[256] = { static const struct state_transition state_csi_ignore[256] = {
[0x00 ... 0x17] = {.action = ACTION_EXECUTE}, [0x00 ... 0x17] = {.action = ACTION_EXECUTE},
@ -333,6 +332,7 @@ static const struct state_transition state_csi_ignore[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_osc_string[256] = { static const struct state_transition state_osc_string[256] = {
[0x00 ... 0x06] = {.action = ACTION_IGNORE}, [0x00 ... 0x06] = {.action = ACTION_IGNORE},
@ -1278,6 +1278,38 @@ state_csi_intermediate_switch(struct terminal *term, uint8_t data)
} }
} }
static enum state
state_csi_ignore_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_IGNORE;
case 0x20 ... 0x3f: action(term, ACTION_IGNORE, data); return STATE_CSI_IGNORE;
case 0x40 ... 0x7e: return STATE_GROUND;
case 0x7f: action(term, ACTION_IGNORE, data); return STATE_CSI_IGNORE;
/* 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_IGNORE;
}
}
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)
{ {
@ -1302,7 +1334,7 @@ vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
case STATE_CSI_ENTRY: term->vt.state = current_state = state_csi_entry_switch(term, data[i]); continue; case STATE_CSI_ENTRY: term->vt.state = current_state = state_csi_entry_switch(term, data[i]); continue;
case STATE_CSI_PARAM: term->vt.state = current_state = state_csi_param_switch(term, data[i]); continue; case STATE_CSI_PARAM: term->vt.state = current_state = state_csi_param_switch(term, data[i]); continue;
case STATE_CSI_INTERMEDIATE: term->vt.state = current_state = state_csi_intermediate_switch(term, data[i]); continue; case STATE_CSI_INTERMEDIATE: term->vt.state = current_state = state_csi_intermediate_switch(term, data[i]); continue;
case STATE_CSI_IGNORE: table = state_csi_ignore; break; case STATE_CSI_IGNORE: term->vt.state = current_state = state_csi_ignore_switch(term, data[i]); continue;
case STATE_OSC_STRING: table = state_osc_string; break; case STATE_OSC_STRING: table = state_osc_string; break;
case STATE_DCS_ENTRY: table = state_dcs_entry; break; case STATE_DCS_ENTRY: table = state_dcs_entry; break;
case STATE_DCS_PARAM: table = state_dcs_param; break; case STATE_DCS_PARAM: table = state_dcs_param; break;