aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0415: not actually using 16 colors with vtp

Browse Source 
Problem:    Not actually using 16 colors with vtp.
Solution:   Always use 256 colors when vtp is used. (Nobuhiro Takasaki,
            closes #3432)
This commit is contained in:
Bram Moolenaar 2018-09-21 12:24:12 +02:00
parent 3f3fb0b147
commit d4f73438bb
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@ -7785,8 +7785,6 @@ did_set_string_option(
#if defined(FEAT_VTP) && defined(FEAT_TERMGUICOLORS) #if defined(FEAT_VTP) && defined(FEAT_TERMGUICOLORS)
if (did_swaptcap) if (did_swaptcap)
{ {
if (t_colors < 256)
p_tgc = 0;
set_termname((char_u *)"win32"); set_termname((char_u *)"win32");
init_highlight(TRUE, FALSE); init_highlight(TRUE, FALSE);
} }

44
src/term.c
View File

@ -6743,35 +6743,35 @@ update_tcap(int attr)
# define KSSIZE 20 # define KSSIZE 20
struct ks_tbl_s struct ks_tbl_s
{ {
int code; /* value of KS_ */ int code; // value of KS_
char *vtp; /* code in vtp mode */ char *vtp; // code in vtp mode
char *vtp2; /* code in vtp2 mode */ char *vtp2; // code in vtp2 mode
char buf[KSSIZE]; /* save buffer in non-vtp mode */ char buf[KSSIZE]; // save buffer in non-vtp mode
char vbuf[KSSIZE]; /* save buffer in vtp mode */ char vbuf[KSSIZE]; // save buffer in vtp mode
char v2buf[KSSIZE]; /* save buffer in vtp2 mode */ char v2buf[KSSIZE]; // save buffer in vtp2 mode
char arr[KSSIZE]; /* real buffer */ char arr[KSSIZE]; // real buffer
}; };
static struct ks_tbl_s ks_tbl[] = static struct ks_tbl_s ks_tbl[] =
{ {
{(int)KS_ME, "\033|0m", "\033|0m"}, /* normal */ {(int)KS_ME, "\033|0m", "\033|0m"}, // normal
{(int)KS_MR, "\033|7m", "\033|7m"}, /* reverse */ {(int)KS_MR, "\033|7m", "\033|7m"}, // reverse
{(int)KS_MD, "\033|1m", "\033|1m"}, /* bold */ {(int)KS_MD, "\033|1m", "\033|1m"}, // bold
{(int)KS_SO, "\033|91m", "\033|91m"}, /* standout: bright red text */ {(int)KS_SO, "\033|91m", "\033|91m"}, // standout: bright red text
{(int)KS_SE, "\033|39m", "\033|39m"}, /* standout end: default color */ {(int)KS_SE, "\033|39m", "\033|39m"}, // standout end: default color
{(int)KS_CZH, "\033|95m", "\033|95m"}, /* italic: bright magenta text */ {(int)KS_CZH, "\033|95m", "\033|95m"}, // italic: bright magenta text
{(int)KS_CZR, "\033|0m", "\033|0m"}, /* italic end */ {(int)KS_CZR, "\033|0m", "\033|0m"}, // italic end
{(int)KS_US, "\033|4m", "\033|4m"}, /* underscore */ {(int)KS_US, "\033|4m", "\033|4m"}, // underscore
{(int)KS_UE, "\033|24m", "\033|24m"}, /* underscore end */ {(int)KS_UE, "\033|24m", "\033|24m"}, // underscore end
# ifdef TERMINFO # ifdef TERMINFO
{(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, /* set background color */ {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, // set background color
{(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, /* set foreground color */ {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, // set foreground color
# else # else
{(int)KS_CAB, "\033|%db", "\033|4%dm"}, /* set background color */ {(int)KS_CAB, "\033|%db", "\033|4%dm"}, // set background color
{(int)KS_CAF, "\033|%df", "\033|3%dm"}, /* set foreground color */ {(int)KS_CAF, "\033|%df", "\033|3%dm"}, // set foreground color
# endif # endif
{(int)KS_CCO, "16", "256"}, /* colors */ {(int)KS_CCO, "256", "256"}, // colors
{(int)KS_NAME} /* terminator */ {(int)KS_NAME} // terminator
}; };
static struct builtin_term * static struct builtin_term *

2
src/version.c
View File

@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
415,
/**/ /**/
414, 414,
/**/ /**/