Mercurial > vim
changeset 12592:895da0cbb16e v8.0.1174
patch 8.0.1174: Mac Terminal.app has wrong color for white
commit https://github.com/vim/vim/commit/a0a6f2776eabfbd4d9174fabdf3921beb7348eda
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Oct 4 18:04:16 2017 +0200
patch 8.0.1174: Mac Terminal.app has wrong color for white
Problem: Mac Terminal.app has wrong color for white.
Solution: Use white from the color cube.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 04 Oct 2017 18:15:05 +0200 |
| parents | ad52810d239c |
| children | 7e2bf37d7a4b |
| files | src/globals.h src/syntax.c src/term.c src/version.c |
| diffstat | 4 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -380,6 +380,9 @@ EXTERN int cterm_normal_bg_color INIT(= EXTERN guicolor_T cterm_normal_fg_gui_color INIT(= INVALCOLOR); EXTERN guicolor_T cterm_normal_bg_gui_color INIT(= INVALCOLOR); #endif +#ifdef FEAT_TERMRESPONSE +EXTERN int is_mac_terminal INIT(= FALSE); /* recognized Terminal.app */ +#endif #ifdef FEAT_AUTOCMD EXTERN int autocmd_busy INIT(= FALSE); /* Is apply_autocmds() busy? */
--- a/src/syntax.c +++ b/src/syntax.c @@ -7350,6 +7350,10 @@ lookup_color(int idx, int foreground, in else color = color_numbers_8[idx]; } + if (t_colors >= 256 && color == 15 && is_mac_terminal) + /* Terminal.app has a bug: 15 is light grey. Use white + * from the color cube instead. */ + color = 231; } return color; }
--- a/src/term.c +++ b/src/term.c @@ -4557,7 +4557,10 @@ check_termcode( /* Mac Terminal.app sends 1;95;0 */ if (version == 95 && STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0) + { is_not_xterm = TRUE; + is_mac_terminal = TRUE; + } /* Gnome terminal sends 1;3801;0, 1;4402;0 or 1;2501;0. * xfce4-terminal sends 1;2802;0.