diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-07-15 10:34:51 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-07-15 10:34:51 +0000 |
| commit | 6550285cf67feb89ca151b7a9326716f6b7862c2 (patch) | |
| tree | d8335d5a96151deddda8dabca3aadf143681f90c /vt.c | |
| parent | vt: implement SI/SO (shift in, shift out) (diff) | |
vt: handle ':'-separated sub parameters correctly
Diffstat (limited to 'vt.c')
| -rw-r--r-- | vt.c | 28 |
1 files changed, 12 insertions, 16 deletions
@@ -229,8 +229,7 @@ static const struct state_transition state_csi_entry[256] = { [0x1c ... 0x1f] = {.action = ACTION_EXECUTE}, [0x20 ... 0x2f] = {.action = ACTION_COLLECT, .state = STATE_CSI_INTERMEDIATE}, [0x30 ... 0x39] = {.action = ACTION_PARAM, .state = STATE_CSI_PARAM}, - [0x3a] = { .state = STATE_CSI_IGNORE}, - [0x3b] = {.action = ACTION_PARAM, .state = STATE_CSI_PARAM}, + [0x3a ... 0x3b] = { .state = STATE_CSI_PARAM}, [0x3c ... 0x3f] = {.action = ACTION_COLLECT, .state = STATE_CSI_PARAM}, [0x40 ... 0x7e] = {.action = ACTION_CSI_DISPATCH, .state = STATE_GROUND}, [0x7f] = {.action = ACTION_IGNORE}, @@ -257,8 +256,7 @@ static const struct state_transition state_csi_param[256] = { [0x1c ... 0x1f] = {.action = ACTION_EXECUTE}, [0x20 ... 0x2f] = {.action = ACTION_COLLECT, .state = STATE_CSI_INTERMEDIATE}, [0x30 ... 0x39] = {.action = ACTION_PARAM}, - [0x3a] = { .state = STATE_CSI_IGNORE}, - [0x3b] = {.action = ACTION_PARAM}, + [0x3a ... 0x3b] = {.action = ACTION_PARAM}, [0x3c ... 0x3f] = { .state = STATE_CSI_IGNORE}, [0x40 ... 0x7e] = {.action = ACTION_CSI_DISPATCH, .state = STATE_GROUND}, [0x7f] = {.action = ACTION_IGNORE}, @@ -843,28 +841,26 @@ action(struct terminal *term, enum action _action, uint8_t c) action_print_utf8(term); break; - case ACTION_PARAM:{ + case ACTION_PARAM: if (term->vt.params.idx == 0) term->vt.params.idx = 1; if (c == ';') { term->vt.params.idx++; } else if (c == ':') { - if (term->vt.params.v[term->vt.params.idx - 1].sub.idx == 0) - term->vt.params.v[term->vt.params.idx - 1].sub.idx = 1; + term->vt.params.v[term->vt.params.idx - 1].sub.idx++; } else { - if (term->vt.params.v[term->vt.params.idx - 1].sub.idx > 0) - term->vt.params.v[term->vt.params.idx - 1].sub.value[term->vt.params.v[term->vt.params.idx - 1].sub.idx] *= 10; - else - term->vt.params.v[term->vt.params.idx - 1].value *= 10; + assert(term->vt.params.idx >= 0); + struct vt_param *param = &term->vt.params.v[term->vt.params.idx - 1]; + + unsigned *value = param->sub.idx > 0 + ? ¶m->sub.value[param->sub.idx - 1] + : ¶m->value; - if (term->vt.params.v[term->vt.params.idx - 1].sub.idx > 0) - term->vt.params.v[term->vt.params.idx - 1].sub.value[term->vt.params.v[term->vt.params.idx - 1].sub.idx] += c - '0'; - else - term->vt.params.v[term->vt.params.idx - 1].value += c - '0'; + *value *= 10; + *value += c - '0'; } break; - } case ACTION_COLLECT: LOG_DBG("collect"); |
