kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 05:35:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7100 from justinmk/tui-colors

Browse Source
This commit is contained in:
Justin M. Keyes 2017-07-30 23:50:46 +02:00 committed by GitHub
commit 13e8356f52
4 changed files with 69 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@ -2736,7 +2736,7 @@ A jump table for the options with a short description can be found at |Q_op|.
'guicursor' 'gcr' string (default "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20") 'guicursor' 'gcr' string (default "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20")
global global
Configures the cursor style for each mode. Works in the GUI and many Configures the cursor style for each mode. Works in the GUI and many
terminals. See |cursor-shape| for details. terminals. See |tui-cursor-shape|.
To disable cursor-styling, reset the option: > To disable cursor-styling, reset the option: >
:set guicursor= :set guicursor=

3
runtime/doc/starting.txt
View File

@ -349,6 +349,9 @@ argument.
*--api-info* *--api-info*
--api-info Print msgpack-encoded |api-metadata| and exit. --api-info Print msgpack-encoded |api-metadata| and exit.
*--headless*
--headless Do not start the built-in UI.
============================================================================== ==============================================================================
2. Initialization *initialization* *startup* 2. Initialization *initialization* *startup*

148
runtime/doc/term.txt
View File

@ -1,76 +1,62 @@
*term.txt* Nvim *term.txt* Nvim
VIM REFERENCE MANUAL by Bram Moolenaar NVIM REFERENCE MANUAL
Terminal information Terminal information
Vim uses information about the terminal you are using to fill the screen and Nvim (except in |--headless| mode) uses information about the terminal you are
recognize what keys you hit. If this information is not correct, the screen using to present a built-in UI. If that information is not correct, the
may be messed up or keys may not be recognized. The actions which have to be screen may be messed up or keys may not be recognized.
performed on the screen are accomplished by outputting a string of
characters.
Type <M-]> to see the table of contents. Type <M-]> to see the table of contents.
============================================================================== ==============================================================================
Startup *startup-terminal* Startup *startup-terminal*
When Vim is started a default terminal type is assumed. for MS-DOS this is Nvim (except in |--headless| mode) guesses a terminal type when it starts.
the pc terminal, for Unix an ansi terminal. |$TERM| is the primary hint that determines the terminal type.
*terminfo* *E557* *E558* *E559* *terminfo* *E557* *E558* *E559*
On Unix the terminfo database is used. There is no access to the terminfo The terminfo database is used if available.
settings with |:set|.
The Unibilium library (used by Nvim to read terminfo) allows you to override The Unibilium library (used by Nvim to read terminfo) allows you to override
an out-of-date system terminfo database with one in your $HOME/.terminfo/ the system terminfo with one in $HOME/.terminfo/ directory, in part or in
directory, in part or in whole. whole.
Building your own up-to-date terminfo database is usually as simple as running Building your own terminfo is usually as simple as running this as
this as a non-superuser: a non-superuser:
> >
wget http://invisible-island.net/datafiles/current/terminfo.src.gz curl -LO http://invisible-island.net/datafiles/current/terminfo.src.gz
gunzip terminfo.src.gz gunzip terminfo.src.gz
tic terminfo.src tic terminfo.src
< <
*TERM* *$TERM*
If you experience terminal difficulties, first ensure that you have set the The $TERM environment variable must match the terminal you are using!
correct terminal type in your $TERM environment variable so that Nvim is Otherwise Nvim cannot know what sequences your terminal expects, and weird
pulling the correct entry from the terminfo database in the first place. or sub-optimal behavior will result (scrolling quirks, wrong colors, etc.).
Per the terminfo source file from ncurses: $TERM is also important because it is mirrored by SSH to the remote session,
unlike other common client-end environment variables ($COLORTERM,
$XTERM_VERSION, $VTE_VERSION, $KONSOLE_PROFILE_NAME, $TERM_PROGRAM, ...).
For these terminals Set $TERM to |builtin-terms|? For this terminal Set $TERM to |builtin-terms|?
iTerm.app "iterm" or "iTerm.app" Y iTerm.app "iterm" or "iTerm.app" Y
anything libvte based "vte" or "vte-256color" Y anything libvte based "vte" or "vte-256color" Y
(e.g. GNOME Terminal) ("gnome" and "gnome-256color" are (e.g. GNOME Terminal) (aliases: "gnome", "gnome-256color")
available as aliases for these)
tmux "tmux" or "tmux-256color" Y tmux "tmux" or "tmux-256color" Y
screen "screen" or "screen-256color" Y screen "screen" or "screen-256color" Y
PuTTY "putty" or "putty-256color" Y PuTTY "putty" or "putty-256color" Y
Terminal.app "nsterm" N Terminal.app "nsterm" N
Linux virtual terminal "linux" or "linux-256color" Y Linux virtual terminal "linux" or "linux-256color" Y
Describing any of these as "xterm" or "xterm-256colour" will not describe the
terminal correctly to Nvim, and will cause various kinds of problematic
behaviours.
Setting your $TERM environment variable to the correct value also avoids the
problem that SSH does not mirror arbitrary client-end environment variables
such as $COLORTERM, $XTERM_VERSION, $VTE_VERSION, $KONSOLE_PROFILE_NAME, and
$TERM_PROGRAM to the server end, whereas it does send the $TERM environment
variable.
See |terminfo| for dealing with out of date terminfo databases.
*builtin-terms* *builtin_terms* *builtin-terms* *builtin_terms*
If a |terminfo| database is not available, or no entry for the terminal type is If a |terminfo| database is not available, or no entry for the terminal type is
found in that database, Nvim will look up the terminal type in a compiled-in found in that database, Nvim will use a compiled-in mini-database of terminfo
mini-database of terminfo entries for "xterm", "putty", "screen", "tmux", entries for "xterm", "putty", "screen", "tmux", "rxvt", "iterm", "interix",
"rxvt", "iterm", "interix", "linux", "st", "vte", "gnome", and "ansi". "linux", "st", "vte", "gnome", and "ansi".
The lookup matches the initial portion of the terminal type, so (for example) The lookup matches the initial portion of the terminal type, so (for example)
"putty-256color" and "putty" will both be mapped to the built-in "putty" "putty-256color" and "putty" will both be mapped to the built-in "putty"
@ -87,8 +73,8 @@ supplying an external one with entries for the terminal type.
Settings depending on terminal *term-dependent-settings* Settings depending on terminal *term-dependent-settings*
If you want to set options or mappings, depending on the terminal name, you If you want to set terminal-dependent options or mappings, you can do this in
can do this best in your init.vim. Example: > your init.vim. Example: >
if $TERM =~ '^\(rxvt\|screen\|interix\|putty\)\(-.*\)\?$' if $TERM =~ '^\(rxvt\|screen\|interix\|putty\)\(-.*\)\?$'
set notermguicolors set notermguicolors
@ -127,62 +113,49 @@ variable, set by genuine Xterm, that it looks for is not automatically
replicated over an SSH login session. replicated over an SSH login session.
*256-color* *terminfo-colors* *termcap-colors* *256-color* *terminfo-colors* *termcap-colors*
Nvim can make use of 256-colour terminals and tries to do so whereever it can. Nvim uses 256 colours by default, ignoring |terminfo| for most terminal types,
including "linux" (whose virtual terminals have had 256-colour support since
4.8) and anything claiming to be "xterm". Also when $COLORTERM or $TERM
contain the string "256".
If the |terminfo| description of the terminal says that it supports fewer Nvim similarly assumes that any terminal emulator that sets $COLORTERM to any
colours, Nvim will override this for many terminal types, including "linux" value, is capable of at least 16-colour operation.
(whose virtual terminals have had 256-colour support since version 4.8) and
anything (even if falsely) claiming to be "xterm". It will also set 256
colours when the COLORTERM or TERM environment variables contain the string
"256" somewhere.
Nvim similarly assumes that any terminal emulator that sets the COLORTERM
environment variable at all, to anything, is capable of at least 16-colour
operation; and it will override |terminfo| saying that it has fewer colours
available.
*true-color* *xterm-true-color* *true-color* *xterm-true-color*
Nvim supports using true (24-bit) colours in the terminal, on terminals that Nvim emits true (24-bit) colours in the terminal, if 'termguicolors' is set.
support it. It uses the same |terminfo| extensions that were proposed by
Rüdiger Sonderfeld in 2013 for this: "setrgbf" and "setrgbb". If your
terminfo definition specifies these, then nothing more is required.
If your terminfo definition is missing them, then Nvim will decide whether to It uses the "setrgbf" and "setrgbb" |terminfo| extensions (proposed by Rüdiger
add them to your terminfo definition, using the ISO 8613-6:1994/ITU T.416:1993 Sonderfeld in 2013). If your terminfo definition is missing them, then Nvim
control sequences for setting RGB colours, but modified to use semicolons will decide whether to add them to your terminfo definition, using the ISO
instead of colons unless the terminal is known to follow the standard. 8613-6:1994/ITU T.416:1993 control sequences for setting RGB colours (but
(Semicolons cause ambiguities that the standard avoided by specifying colons modified to use semicolons instead of colons unless the terminal is known to
as a sub-parameter delimiter. A historical misunderstanding meant that many follow the standard).
terminal emulators ended up using semicolons for many years, though.)
A new convention, pioneered in 2016 by tmux, is the "Tc" terminfo extension. Another convention, pioneered in 2016 by tmux, is the "Tc" terminfo extension.
If your terminal's terminfo definition has this flag, Nvim will add If terminfo has this flag, Nvim will add constructed "setrgbf" and "setrgbb"
constructed "setrgbf" and "setrgbb" capabilities as if they had been in the capabilities as if they had been in the terminfo definition.
terminfo definition.
If your terminal's terminfo definition does not (yet) have this flag, Nvim If terminfo does not (yet) have this flag, Nvim will fall back to $TERM and
will fall back to looking at the TERM and other environment variables. It other environment variables. It will add constructed "setrgbf" and "setrgbb"
will add constructed "setrgbf" and "setrgbb" capabilities in the case of the capabilities in the case of the the "rxvt", "linux", "st", "tmux", and "iterm"
the "rxvt", "linux", "st", "tmux", and "iterm" terminal types, or when terminal types, or when Konsole, genuine Xterm, a libvte terminal emulator
Konsole, genuine Xterm, a libvte terminal emulator version 0.36 or later, or a version 0.36 or later, or a terminal emulator that sets the COLORTERM
terminal emulator that sets the COLORTERM environment variable to "truecolor" environment variable to "truecolor" is detected.
is detected.
*xterm-resize* *xterm-resize*
Nvim can resize the terminal display on some terminals that implement an Nvim can resize the terminal display on some terminals that implement an
extension pioneered by the dtterm program. |terminfo| does not have a flag extension pioneered by dtterm. |terminfo| does not have a flag for this
for this extension. So Nvim simply assumes that (all) "dtterm", "xterm", extension. So Nvim simply assumes that (all) "dtterm", "xterm", "teraterm",
"teraterm", "rxvt" terminal types, and Konsole, are capable of this. "rxvt" terminal types, and Konsole, are capable of this.
*cursor-shape* *terminfo-cursor-shape* *termcap-cursor-shape* *tui-cursor-shape*
Nvim will adjust the shape of the cursor from a block to a line when in insert Nvim will adjust the shape of the cursor from a block to a line when in insert
mode (or as specified by the 'guicursor' option), on terminals that support mode (or as specified by the 'guicursor' option), on terminals that support
it. It uses the same |terminfo| extensions that were pioneered by tmux for it. It uses the same |terminfo| extensions that were pioneered by tmux for
this: "Ss" and "Se". If your terminfo definition specifies these, as some this: "Ss" and "Se".
(such as those based upon "xterm+tmux") do, then nothing more is required.
If your terminfo definition is missing them, then Nvim will decide whether to If your terminfo definition is missing them, then Nvim will decide whether to
add them to your terminfo definition, by looking at the TERM and other add them to your terminfo definition, by looking at $TERM and other
environment variables. For the "rxvt", "putty", "linux", "screen", environment variables. For the "rxvt", "putty", "linux", "screen",
"teraterm", and "iterm" terminal types, or when Konsole, a libvte-based "teraterm", and "iterm" terminal types, or when Konsole, a libvte-based
terminal emulator, or genuine Xterm are detected, it will add constructed terminal emulator, or genuine Xterm are detected, it will add constructed
@ -195,19 +168,14 @@ receives from Nvim into whatever control sequence is appropriate for the
terminal that it is outputting to. It shares a common mechanism with Nvim, of terminal that it is outputting to. It shares a common mechanism with Nvim, of
using the "Ss" and "Se" capabilities from terminfo (for the output terminal) using the "Ss" and "Se" capabilities from terminfo (for the output terminal)
if they are present. Unlike Nvim, if they are not present in terminfo you if they are present. Unlike Nvim, if they are not present in terminfo you
will have to add them by setting the tmux "terminal-overrides" setting in must add them by setting "terminal-overrides" in ~/.tmux.conf .
$HOME/.tmux.conf .
See the tmux(1) manual page for the details of how and what to do in the tmux See the tmux(1) manual page for the details of how and what to do in the tmux
configuration file. It will look something like: > configuration file. It will look something like: >
set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
<or (alas!) for Konsole specifically, something more complex like: > <or (alas!) for Konsole specifically, something more complex like: >
set -ga terminal-overrides \ set -ga terminal-overrides 'xterm*:\E]50;CursorShape=%?%p1%{3}%<%t%{0}%e%{1}%;%d\007'
'xterm*:\E]50;CursorShape=%?%p1%{3}%<%t%{0}%e%{1}%;%d\007' <
<but these are only rough examples that do not include all of the other stuff
that occurs in that setting.
*cs7-problem* *cs7-problem*
Note: If the terminal settings are changed after running Vim, you might have Note: If the terminal settings are changed after running Vim, you might have
an illegal combination of settings. This has been reported on Solaris 2.5 an illegal combination of settings. This has been reported on Solaris 2.5

15
src/nvim/tui/tui.c
View File

@ -1537,11 +1537,11 @@ static void augment_terminfo(TUIData *data, const char *term,
bool teraterm = terminfo_is_term_family(term, "teraterm"); bool teraterm = terminfo_is_term_family(term, "teraterm");
bool putty = terminfo_is_term_family(term, "putty"); bool putty = terminfo_is_term_family(term, "putty");
bool screen = terminfo_is_term_family(term, "screen"); bool screen = terminfo_is_term_family(term, "screen");
bool tmux = terminfo_is_term_family(term, "tmux") || !!os_getenv("TMUX");
bool iterm = terminfo_is_term_family(term, "iterm") bool iterm = terminfo_is_term_family(term, "iterm")
|| terminfo_is_term_family(term, "iTerm.app"); || terminfo_is_term_family(term, "iTerm.app");
// None of the following work over SSH; see :help TERM . // None of the following work over SSH; see :help TERM .
bool iterm_pretending_xterm = xterm && iterm_env; bool iterm_pretending_xterm = xterm && iterm_env;
bool tmux_wrap = screen && !!os_getenv("TMUX");
const char * xterm_version = os_getenv("XTERM_VERSION"); const char * xterm_version = os_getenv("XTERM_VERSION");
bool true_xterm = xterm && !!xterm_version; bool true_xterm = xterm && !!xterm_version;
@ -1573,12 +1573,11 @@ static void augment_terminfo(TUIData *data, const char *term,
// specific ones. // specific ones.
// can use colons like ISO 8613-6:1994/ITU T.416:1993 says. // can use colons like ISO 8613-6:1994/ITU T.416:1993 says.
bool has_colon_rgb = false bool has_colon_rgb = !tmux && !screen
// per GNOME bug #685759 and bug #704449 && ((vte_version >= 3600) // per GNOME bug #685759, #704449
|| (vte_version >= 3600) || iterm || iterm_pretending_xterm // per analysis of VT100Terminal.m
|| iterm || iterm_pretending_xterm // per analysis of VT100Terminal.m // per http://invisible-island.net/xterm/xterm.log.html#xterm_282
// per http://invisible-island.net/xterm/xterm.log.html#xterm_282 || true_xterm);
|| true_xterm;
data->unibi_ext.set_rgb_foreground = unibi_find_ext_str(ut, "setrgbf"); data->unibi_ext.set_rgb_foreground = unibi_find_ext_str(ut, "setrgbf");
if (-1 == data->unibi_ext.set_rgb_foreground) { if (-1 == data->unibi_ext.set_rgb_foreground) {
@ -1606,7 +1605,7 @@ static void augment_terminfo(TUIData *data, const char *term,
// all panes, which is not particularly desirable. A better approach // all panes, which is not particularly desirable. A better approach
// would use a tmux control sequence and an extra if(screen) test. // would use a tmux control sequence and an extra if(screen) test.
data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str( data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
ut, NULL, TMUX_WRAP(tmux_wrap, "\033]Pl%p1%06x\033\\")); ut, NULL, TMUX_WRAP(tmux, "\033]Pl%p1%06x\033\\"));
} else if (xterm || (vte_version != 0) || rxvt) { } else if (xterm || (vte_version != 0) || rxvt) {
// This seems to be supported for a long time in VTE // This seems to be supported for a long time in VTE
// urxvt also supports this // urxvt also supports this