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

Readd unconst cast to tparm calls

Browse source 
Removed in 0dfa7421f3, breaks build with NetBSD curses.
This commit is contained in:
Fabian Homborg 2020-01-05 18:51:33 +01:00
parent f1ce967dfa
commit 484e590b7b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/screen.cpp
View file

@ -1153,7 +1153,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
if (screen_width > non_space_width) { if (screen_width > non_space_width) {
bool justgrey = true; bool justgrey = true;
if (cur_term && enter_dim_mode) { if (cur_term && enter_dim_mode) {
std::string dim = tparm(enter_dim_mode); std::string dim = tparm((char *)enter_dim_mode);
if (!dim.empty()) { if (!dim.empty()) {
// Use dim if they have it, so the color will be based on their actual normal // Use dim if they have it, so the color will be based on their actual normal
// color and the background of the termianl. // color and the background of the termianl.
@ -1164,14 +1164,14 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
if (cur_term && justgrey && set_a_foreground) { if (cur_term && justgrey && set_a_foreground) {
if (max_colors >= 238) { if (max_colors >= 238) {
// draw the string in a particular grey // draw the string in a particular grey
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 237))); abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 237)));
} else if (max_colors >= 9) { } else if (max_colors >= 9) {
// bright black (the ninth color, looks grey) // bright black (the ninth color, looks grey)
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8))); abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 8)));
} else if (max_colors >= 2 && enter_bold_mode) { } else if (max_colors >= 2 && enter_bold_mode) {
// we might still get that color by setting black and going bold for bright // 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((char *)enter_bold_mode)));
abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 0))); abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 0)));
} }
} }
@ -1179,7 +1179,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
if (cur_term && exit_attribute_mode) { if (cur_term && exit_attribute_mode) {
abandon_line_string.append( abandon_line_string.append(
str2wcstring(tparm(exit_attribute_mode))); // normal text ANSI escape sequence str2wcstring(tparm((char *)exit_attribute_mode))); // normal text ANSI escape sequence
} }
int newline_glitch_width = term_has_xn ? 0 : 1; int newline_glitch_width = term_has_xn ? 0 : 1;