github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-31 00:45:17 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

screen.cpp: fix omitted newline char color on VCs

Browse Source 
It's the ninth color - on virtual consoles this was likely to
try a color that doesn't work because we checked if max_colors >= 8.

Add another way to reach that color on terminals with only 8 colors
by using bold mode to get a bright.

This has potential to fail by simply rendering as black which can cause
it to be invisible on a white-on-black terminal. Not bad as it's just
making this bell/whistle invisible:

We *really* want to set the omitted newline character apart by having
it appear grey. On (FreeBSD consoles, at least) VCs it's not uncommon
for it to render as a "?". It's particularly confusing if it doesn't
render in a darker color as it cannot be discerned from actual program
output.
This commit is contained in:
Aaron Gyes 2016-10-03 12:41:53 -07:00
parent 0c23b5652a
commit ce6e9b52ce
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/screen.cpp
View File

@ -1198,15 +1198,21 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
justgrey = false;
}
}
if (justgrey && set_a_foreground && max_colors >= 237) {
// Draw the string in grey
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 237)));
} else if (justgrey && set_a_foreground && max_colors >= 8) {
// Draw the string in bright black.
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8)));
if (justgrey && set_a_foreground) {
if (max_colors >= 238) {
// draw the string in a particular grey
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 237)));
} else if (max_colors >= 9) {
// bright black (the ninth color, looks grey)
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8)));
} else if (max_colors >= 2 && enter_bold_mode) {
// we might still get that color by setting black and going bold for bright
abandon_line_string.append(str2wcstring(tparm(enter_bold_mode)));
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 0)));
}
}
abandon_line_string.push_back(omitted_newline_char);
if (exit_attribute_mode) {
abandon_line_string.append(str2wcstring(tparm(exit_attribute_mode))); // normal text ANSI escape sequence
}
@ -1218,6 +1224,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
// spaces from the new line
abandon_line_string.append(non_space_width, L' ');
abandon_line_string.push_back(L'\r');
// clear entire line - el2
abandon_line_string.append(L"\x1b[2K");
const std::string narrow_abandon_line_string = wcs2string(abandon_line_string);