diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-04 21:41:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-04 21:41:28 +0200 |
| commit | cea254f5a793bf447d6ea2eb926cba38e73adece (patch) | |
| tree | d45eaf362ac75df840894f5886195ca6e2a773dd | |
| parent | 277e79adc4d2b62556ce8a3720684e4b3e1e6d42 (diff) | |
patch 8.1.1464: only 4-digit rgb termresponse is recognizedv8.1.1464
Problem: Only 4-digit rgb termresponse is recognized.
Solution: Also recognize 2-digit rgb response. (closes #4486)
| -rw-r--r-- | src/term.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/term.c b/src/term.c index cd0e7d31ea..bcd2184f4f 100644 --- a/src/term.c +++ b/src/term.c @@ -4962,6 +4962,7 @@ check_termcode( /* Check for fore/background color response from the terminal: * * {lead}{code};rgb:{rrrr}/{gggg}/{bbbb}{tail} + * or {lead}{code};rgb:{rr}/{gg}/{bb}{tail} * * {code} is 10 for foreground, 11 for background * {lead} can be <Esc>] or OSC @@ -4985,14 +4986,19 @@ check_termcode( : (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\'))) { int is_bg = argp[1] == '1'; + int is_4digit = i - j >= 21 && tp[j + 11] == '/' + && tp[j + 16] == '/'; - if (i - j >= 21 && STRNCMP(tp + j + 3, "rgb:", 4) == 0 - && tp[j + 11] == '/' && tp[j + 16] == '/') + if (i - j >= 14 && STRNCMP(tp + j + 3, "rgb:", 4) == 0 + && (is_4digit + || (tp[j + 9] == '/' && tp[i + 12 == '/']))) { # ifdef FEAT_TERMINAL - int rval = hexhex2nr(tp + j + 7); - int gval = hexhex2nr(tp + j + 12); - int bval = hexhex2nr(tp + j + 17); + int rval, gval, bval; + + rval = hexhex2nr(tp + j + 7); + gval = hexhex2nr(tp + j + (is_4digit ? 12 : 10)); + bval = hexhex2nr(tp + j + (is_4digit ? 17 : 13)); # endif if (is_bg) { diff --git a/src/version.c b/src/version.c index 7d86aaeb46..57f6db3911 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1464, +/**/ 1463, /**/ 1462, |