From 96bd55f7c4dc3873011027a66bae72e1aff1153d Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 15:03:16 +0200 Subject: terminal: only support a single intermediate/private character --- csi.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 08e69fa5..0ab16999 100644 --- a/csi.c +++ b/csi.c @@ -255,8 +255,8 @@ csi_as_string(struct terminal *term, uint8_t final) static char msg[1024]; int c = snprintf(msg, sizeof(msg), "CSI: "); - for (size_t i = 0; i < term->vt.intermediates.idx; i++) - c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.intermediates.data[i]); + if (term->vt.private != 0) + c += snprintf(&msg[c], sizeof(msg) - c, "%c", term->vt.private); for (size_t i = 0; i < term->vt.params.idx; i++){ c += snprintf(&msg[c], sizeof(msg) - c, "%d", @@ -281,7 +281,8 @@ csi_dispatch(struct terminal *term, uint8_t final) { LOG_DBG("%s", csi_as_string(term, final)); - if (term->vt.intermediates.idx == 0) { + switch (term->vt.private) { + case 0: { switch (final) { case 'c': write(term->ptmx, "\033[?6c", 5); @@ -577,12 +578,13 @@ csi_dispatch(struct terminal *term, uint8_t final) default: LOG_ERR("unimplemented: %s", csi_as_string(term, final)); abort(); + break; } - } - else if (term->vt.intermediates.idx == 1 && - term->vt.intermediates.data[0] == '?') { + break; /* private == 0 */ + } + case '?': { switch (final) { case 'h': { for (size_t i = 0; i < term->vt.params.idx; i++) { @@ -761,10 +763,11 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_ERR("unimplemented: %s", csi_as_string(term, final)); abort(); } + + break; /* private == '?' */ } - else if (term->vt.intermediates.idx == 1 && - term->vt.intermediates.data[0] == '>') { + case '>': { switch (final) { case 'c': { int param = param_get(term, 0, 0); @@ -784,10 +787,13 @@ csi_dispatch(struct terminal *term, uint8_t final) LOG_ERR("unimplemented: %s", csi_as_string(term, final)); abort(); } + + break; /* private == '>' */ } - else { + default: LOG_ERR("unimplemented: %s", csi_as_string(term, final)); abort(); + break; } } -- cgit v1.3