Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

screen.cpp: try grey for the newline character.

Browse source 
what we really were using before was color 8 (white).
This commit is contained in:
Aaron Gyes 2016-10-03 05:35:08 -07:00
parent 53f1ebaf6b
commit 40a83e4018
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/screen.cpp
View file

@ -1188,18 +1188,28 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
// omitted_newline_char in common.cpp. // omitted_newline_char in common.cpp.
int non_space_width = fish_wcwidth(omitted_newline_char); int non_space_width = fish_wcwidth(omitted_newline_char);
if (screen_width >= non_space_width) { if (screen_width >= non_space_width) {
bool justgrey = true;
if (enter_dim_mode) { if (enter_dim_mode) {
// Use dim if they have it, so the color will be based on their actual normal color and the background of the termianl. std::string dim = tparm(enter_dim_mode);
abandon_line_string.append(str2wcstring(tparm(enter_dim_mode))); if (!dim.empty()) {
// Use dim if they have it, so the color will be based on their actual normal
// color and the background of the termianl.
abandon_line_string.append(str2wcstring(dim));
justgrey = false;
}
} }
else if (set_a_foreground && max_colors >= 8) { if (justgrey && set_a_foreground && max_colors >= 235) {
// Draw the string in gray. // Draw the string in grey
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 235)));
} else if (justgrey && set_a_foreground && max_colors >= 8) {
// Draw the string in white.
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8))); abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8)));
} }
abandon_line_string.push_back(omitted_newline_char); abandon_line_string.push_back(omitted_newline_char);
if (exit_attribute_mode) if (exit_attribute_mode) {
abandon_line_string.append(str2wcstring(tparm(exit_attribute_mode))); // normal text ANSI escape sequence abandon_line_string.append(str2wcstring(tparm(exit_attribute_mode))); // normal text ANSI escape sequence
}
abandon_line_string.append(screen_width - non_space_width, L' '); abandon_line_string.append(screen_width - non_space_width, L' ');
} }
abandon_line_string.push_back(L'\r'); abandon_line_string.push_back(L'\r');