From 21db90d1d1bddf681cc8cd11457f5586a9649e26 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 11 Jul 2026 16:21:04 +0900 Subject: konsole: add support for colon-separated sub-params in CSI and DCS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a backport of commit 316a386d from KDE's Konsole code (https://github.com/KDE/konsole/commit/316a386d92a083e235624e9f81df3b6dbbe08bff). The code has been adjusted to fit within the existing TDE's Konsole code. ------------------------------------------------------------ Original author: Luis Javier Merino Morán Original commit message: Support colon-separated sub-params in CSI and DCS This adds supports for sub-parameters in control sequences. For now, it supports the colon-separated variants of SGR 38 and SGR 48 for RGB and indexed colours: CSI 38 : 2 : : : : [ : ... ] m CSI 38 : 2 : : : m CSI 38 : 5 : m and likewise for SGR 48. is ignored (it's supposed to be a colour space id, to support different kinds of RGB) ------------------------------------------------------------ Co-authored-by: Opencode/Big Pickle Signed-off-by: Michele Calgaro --- konsole/src/TEmuVt102.cpp | 59 +++++++++++++++++++++++++++++++++++------------ konsole/src/TEmuVt102.h | 16 ++++++++++--- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/konsole/src/TEmuVt102.cpp b/konsole/src/TEmuVt102.cpp index d631639e4..a52c0a1f6 100644 --- a/konsole/src/TEmuVt102.cpp +++ b/konsole/src/TEmuVt102.cpp @@ -226,24 +226,40 @@ void TEmuVt102::reset() /* The tokenizers state The state is represented by the buffer (pbuf, ppos), - and accompanied by decoded arguments kept in (argv,argc). + and accompanied by decoded arguments kept in params. Note that they are kept internal in the tokenizer. */ void TEmuVt102::resetToken() { - ppos = 0; argc = 0; argv[0] = 0; argv[1] = 0; + ppos = 0; + params.count = 0; params.value[0] = 0; params.value[1] = 0; + params.sub[0].value[0] = 0; params.sub[0].count = 0; } void TEmuVt102::addDigit(int dig) { - argv[argc] = 10*argv[argc] + dig; + if (params.sub[params.count].count == 0) { + params.value[params.count] = 10*params.value[params.count] + dig; + } else { + struct SubParam *sub = ¶ms.sub[params.count]; + sub->value[sub->count] = 10*sub->value[sub->count] + dig; + } } void TEmuVt102::addArgument() { - argc = TQMIN(argc+1,MAXARGS-1); - argv[argc] = 0; + params.count = TQMIN(params.count+1,MAXARGS-1); + params.value[params.count] = 0; + params.sub[params.count].value[0] = 0; + params.sub[params.count].count = 0; +} + +void TEmuVt102::addSub() +{ + struct SubParam *sub = ¶ms.sub[params.count]; + sub->count = TQMIN(sub->count+1,MAXARGS-1); + sub->value[sub->count] = 0; } void TEmuVt102::pushToToken(int cc) @@ -341,29 +357,42 @@ void TEmuVt102::onRcvChar(int cc) if (lec(2,0,ESC)) { tau( TY_ESC(s[1]), 0, 0); resetToken(); return; } if (les(3,1,SCS)) { tau( TY_ESC_CS(s[1],s[2]), 0, 0); resetToken(); return; } if (lec(3,1,'#')) { tau( TY_ESC_DE(s[2]), 0, 0); resetToken(); return; } - if (eps( CPN)) { tau( TY_CSI_PN(cc), argv[0],argv[1]); resetToken(); return; } + if (eps( CPN)) { tau( TY_CSI_PN(cc), params.value[0],params.value[1]); resetToken(); return; } // resize = \e[8;;t - if (eps( CPS)) { tau( TY_CSI_PS(cc, argv[0]), argv[1], argv[2]); resetToken(); return; } + if (eps( CPS)) { tau( TY_CSI_PS(cc, params.value[0]), params.value[1], params.value[2]); resetToken(); return; } if (epe( )) { tau( TY_CSI_PE(cc), 0, 0); resetToken(); return; } if (ees( DIG)) { addDigit(cc-'0'); return; } - if (eec( ';')) { addArgument(); return; } - for (i=0;i<=argc;i++) - if ( epp( )) { tau( TY_CSI_PR(cc,argv[i]), 0, 0); } + if (eec(';')) { addArgument(); return; } + if (eec(':')) { addSub(); return; } + for (i=0;i<=params.count;i++) + if ( epp( )) { tau( TY_CSI_PR(cc,params.value[i]), 0, 0); } else if(egt( )) { tau( TY_CSI_PG(cc ), 0, 0); } // spec. case for ESC]>0c or ESC]>c - else if (cc == 'm' && argc - i >= 4 && (argv[i] == 38 || argv[i] == 48) && argv[i+1] == 2) + else if (cc == 'm' && params.count - i >= 4 && (params.value[i] == 38 || params.value[i] == 48) && params.value[i+1] == 2) { // ESC[ ... 48;2;;; ... m -or- ESC[ ... 38;2;;; ... m i += 2; - tau( TY_CSI_PS(cc, argv[i-2]), COLOR_SPACE_RGB, (argv[i] << 16) | (argv[i+1] << 8) | argv[i+2]); + tau( TY_CSI_PS(cc, params.value[i-2]), COLOR_SPACE_RGB, (params.value[i] << 16) | (params.value[i+1] << 8) | params.value[i+2]); i += 2; } - else if (cc == 'm' && argc - i >= 2 && (argv[i] == 38 || argv[i] == 48) && argv[i+1] == 5) + else if (cc == 'm' && params.sub[i].count >= 5 && (params.value[i] == 38 || params.value[i] == 48) && params.sub[i].value[1] == 2) + { // ESC[ ... 48:2:::: ... m -or- ESC[ ... 38:2:::: ... m + tau( TY_CSI_PS(cc, params.value[i]), COLOR_SPACE_RGB, (params.sub[i].value[3] << 16) | (params.sub[i].value[4] << 8) | params.sub[i].value[5]); + } + else if (cc == 'm' && params.sub[i].count == 4 && (params.value[i] == 38 || params.value[i] == 48) && params.sub[i].value[1] == 2) + { // ESC[ ... 48:2::: ... m -or- ESC[ ... 38:2::: ... m + tau( TY_CSI_PS(cc, params.value[i]), COLOR_SPACE_RGB, (params.sub[i].value[2] << 16) | (params.sub[i].value[3] << 8) | params.sub[i].value[4]); + } + else if (cc == 'm' && params.count - i >= 2 && (params.value[i] == 38 || params.value[i] == 48) && params.value[i+1] == 5) { // ESC[ ... 48;5; ... m -or- ESC[ ... 38;5; ... m i += 2; - tau( TY_CSI_PS(cc, argv[i-2]), COLOR_SPACE_256, argv[i]); + tau( TY_CSI_PS(cc, params.value[i-2]), COLOR_SPACE_256, params.value[i]); + } + else if (cc == 'm' && params.sub[i].count >= 2 && (params.value[i] == 38 || params.value[i] == 48) && params.sub[i].value[1] == 5) + { // ESC[ ... 48:5: ... m -or- ESC[ ... 38:5: ... m + tau( TY_CSI_PS(cc, params.value[i]), COLOR_SPACE_256, params.sub[i].value[2]); } - else { tau( TY_CSI_PS(cc,argv[i]), 0, 0); } + else { tau( TY_CSI_PS(cc,params.value[i]), 0, 0); } resetToken(); } else // mode VT52 diff --git a/konsole/src/TEmuVt102.h b/konsole/src/TEmuVt102.h index 25eed0b48..d2c9cc86c 100644 --- a/konsole/src/TEmuVt102.h +++ b/konsole/src/TEmuVt102.h @@ -100,11 +100,21 @@ private: void pushToToken(int cc); int pbuf[MAXPBUF]; //FIXME: overflow? int ppos; -#define MAXARGS 15 +#define MAXARGS 16 void addDigit(int dig); void addArgument(); - int argv[MAXARGS]; - int argc; + void addSub(); + + struct SubParam { + int value[MAXARGS]; + int count; + }; + + struct { + int value[MAXARGS]; + struct SubParam sub[MAXARGS]; + int count; + } params; void initTokenizer(); int tbl[256]; -- cgit v1.2.3