nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

termcap.c: Don't use hilites[CLR_BLACK] = NULL for ANSI_DEFAULT

Browse Source 
This didn't crash since xputs is defensive and checks if it got a NULL
string, but it also didn't display black entries (dragons, unicorns,
orcish arrows, ...) as black or otherwise different from gray entries.
This commit is contained in:
Heinrich Kuttler
2021-07-22 11:11:23 +03:00
committed by Pasi Kallinen
parent 932b6d03c9
commit 28b3902ea7
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/termcap.c
+16 -1
View File
@@ -1179,6 +1179,16 @@ init_hilite(void)
Sprintf(hilites[c], "\033[0;3%dm", c); Sprintf(hilites[c], "\033[0;3%dm", c);
} }
} }
/* See TEXTCOLOR && TERMLIB && UNIX && TERMINFO code above. */
if (iflags.wc2_darkgray) {
/* Bright black is dark gray. */
hilites[CLR_BLACK] = (char *) alloc(sizeof "\033[1;30m");
Sprintf(hilites[CLR_BLACK], "\033[1;30m");
} else {
/* Use blue for black. */
hilites[CLR_BLACK] = hilites[CLR_BLUE];
}
} }
static void static void
@@ -1200,7 +1210,12 @@ kill_hilite(void)
if (hilites[c | BRIGHT] && hilites[c | BRIGHT] != nh_HI) if (hilites[c | BRIGHT] && hilites[c | BRIGHT] != nh_HI)
free((genericptr_t) hilites[c | BRIGHT]), hilites[c | BRIGHT] = 0; free((genericptr_t) hilites[c | BRIGHT]), hilites[c | BRIGHT] = 0;
} }
return;
if (hilites[CLR_BLACK]) {
if (hilites[CLR_BLACK] != hilites[CLR_BLUE])
free(hilites[CLR_BLACK]);
hilites[CLR_BLACK] = 0;
}
} }
#endif /* TEXTCOLOR && !TERMLIB && ANSI_DEFAULT */ #endif /* TEXTCOLOR && !TERMLIB && ANSI_DEFAULT */