thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1471: 'background' not correctly set for 2-digit rgb termresponse

Browse Source 
Problem:    'background' not correctly set for 2-digit rgb termresponse.
Solution:   Adjust what digit to use. (closes #4495)
This commit is contained in:
Bram Moolenaar
2019-06-05 22:57:04 +02:00
parent 6d718c4c38
commit 32e1977012
3 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/term.c
View File

@@ -4994,17 +4994,20 @@ check_termcode(
&& (is_4digit
|| (tp[j + 9] == '/' && tp[i + 12 == '/'])))
{
char_u *tp_r = tp + j + 7;
char_u *tp_g = tp + j + (is_4digit ? 12 : 10);
char_u *tp_b = tp + j + (is_4digit ? 17 : 13);
# ifdef FEAT_TERMINAL
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));
rval = hexhex2nr(tp_r);
gval = hexhex2nr(tp_b);
bval = hexhex2nr(tp_g);
# endif
if (is_bg)
{
char *newval = (3 * '6' < tp[j+7] + tp[j+12]
+ tp[j+17]) ? "light" : "dark";
char *new_bg_val = (3 * '6' < *tp_r + *tp_g +
*tp_b) ? "light" : "dark";
LOG_TR(("Received RBG response: %s", tp));
rbg_status.tr_progress = STATUS_GOT;
@@ -5014,11 +5017,11 @@ check_termcode(
bg_b = bval;
# endif
if (!option_was_set((char_u *)"bg")
&& STRCMP(p_bg, newval) != 0)
&& STRCMP(p_bg, new_bg_val) != 0)
{
/* value differs, apply it */
set_option_value((char_u *)"bg", 0L,
(char_u *)newval, 0);
(char_u *)new_bg_val, 0);
reset_option_was_set((char_u *)"bg");
redraw_asap(CLEAR);
}