aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-12-20 20:09:00 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-12-20 20:09:00 +0000
commit0d6555bea9220aca8ddb498a9eab2f4765da8fd4 (patch)
tree3b5b78a6cc97d5b1505cb3faec51fa2d0290e0db
parentvt: convert CSI param from table lookup to switch (diff)
vt: convert CSI intermediate from table lookup to switch
-rw-r--r--vt.c37
1 files changed, 35 insertions, 2 deletions
diff --git a/vt.c b/vt.c
index dd598d94..8f5948ed 100644
--- a/vt.c
+++ b/vt.c
@@ -283,7 +283,6 @@ static const struct state_transition state_csi_param[256] = {
[0x9d] = { .state = STATE_OSC_STRING},
[0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING},
};
-#endif
static const struct state_transition state_csi_intermediate[256] = {
[0x00 ... 0x17] = {.action = ACTION_EXECUTE},
@@ -309,6 +308,7 @@ static const struct state_transition state_csi_intermediate[256] = {
[0x9d] = { .state = STATE_OSC_STRING},
[0x9e ... 0x9f] = { .state = STATE_SOS_PM_APC_STRING},
};
+#endif
static const struct state_transition state_csi_ignore[256] = {
[0x00 ... 0x17] = {.action = ACTION_EXECUTE},
@@ -1245,6 +1245,39 @@ state_csi_param_switch(struct terminal *term, uint8_t data)
}
}
+static enum state
+state_csi_intermediate_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_INTERMEDIATE;
+
+ case 0x20 ... 0x2f: action(term, ACTION_COLLECT, data); return STATE_CSI_INTERMEDIATE;
+ case 0x30 ... 0x3f: return STATE_CSI_IGNORE;
+ case 0x40 ... 0x7e: action(term, ACTION_CSI_DISPATCH, data); return STATE_GROUND;
+ case 0x7f: action(term, ACTION_IGNORE, data); return STATE_CSI_INTERMEDIATE;
+
+ /* 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_INTERMEDIATE;
+ }
+}
+
void
vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
{
@@ -1268,7 +1301,7 @@ vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
case STATE_ESCAPE_INTERMEDIATE: term->vt.state = current_state = state_escape_intermediate_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_INTERMEDIATE: table = state_csi_intermediate; break;
+ 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_OSC_STRING: table = state_osc_string; break;
case STATE_DCS_ENTRY: table = state_dcs_entry; break;