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

patch 8.2.0804: libvterm code lags behind the upstream version

Browse Source 
Problem:    Libvterm code lags behind the upstream version.
Solution:   Include revision 727, but add the index instead of switching
            between RGB and indexed.
This commit is contained in:
Bram Moolenaar
2020-05-21 20:10:04 +02:00
parent 83a52533b2
commit e5886ccb51
12 changed files with 408 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/term.c
View File

@@ -6357,12 +6357,6 @@ static int grey_ramp[] = {
0x80, 0x8A, 0x94, 0x9E, 0xA8, 0xB2, 0xBC, 0xC6, 0xD0, 0xDA, 0xE4, 0xEE
};
# ifdef FEAT_TERMINAL
# include "libvterm/include/vterm.h" // for VTERM_ANSI_INDEX_NONE
# else
# define VTERM_ANSI_INDEX_NONE 0
# endif
static char_u ansi_table[16][4] = {
// R G B idx
{ 0, 0, 0, 1}, // black
@@ -6384,6 +6378,8 @@ static char_u ansi_table[16][4] = {
{255, 255, 255, 16}, // white
};
#define ANSI_INDEX_NONE 0
void
cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx)
{
@@ -6403,7 +6399,7 @@ cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx)
*r = cube_value[idx / 36 % 6];
*g = cube_value[idx / 6 % 6];
*b = cube_value[idx % 6];
*ansi_idx = VTERM_ANSI_INDEX_NONE;
*ansi_idx = ANSI_INDEX_NONE;
}
else if (nr < 256)
{
@@ -6412,14 +6408,14 @@ cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx)
*r = grey_ramp[idx];
*g = grey_ramp[idx];
*b = grey_ramp[idx];
*ansi_idx = VTERM_ANSI_INDEX_NONE;
*ansi_idx = ANSI_INDEX_NONE;
}
else
{
*r = 0;
*g = 0;
*b = 0;
*ansi_idx = 0;
*ansi_idx = ANSI_INDEX_NONE;
}
}
#endif