noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-11 01:35:17 +01:00
Code Issues Activity

Use bright colors on supporting terminals in tty port

Browse source 
Terminals supporting more than 8 colors can directly display the bright
colors (upper 8 colors of the 16 color palette).

The tty port now only uses bold for displaying bright colors for
terminals with 8 colors.

Based on UnNetHack commit b5269052d8.
This commit is contained in:
Ron Nazarov 2024-03-25 00:12:51 +00:00 • committed by ChrisANG
parent f3e99021f6
commit 2d3d44d307
1 changed files with 47 additions and 28 deletions

75
win/tty/termcap.c
View file

@ -889,8 +889,9 @@ init_hilite()
register int c;
char *setf, *scratch;
int length_md;
int colors = tgetnum("Co");
if (tgetnum("Co") < 8
if (colors < 8
|| (MD == NULL) || (strlen(MD) == 0)
|| ((setf = tgetstr("AF", (char **)0)) == (char *)0
&& (setf = tgetstr("Sf", (char **)0)) == (char *)0))
@ -923,44 +924,62 @@ init_hilite()
c = 6;
while (c--)
{
char *work;
scratch = tparm(setf,ti_map[c].ti_color);
work = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(work,MD);
hilites[ti_map[c].nh_bright_color] = work;
work += length_md;
Strcpy(work,scratch);
hilites[ti_map[c].nh_color] = work;
scratch = tparm(setf,ti_map[c].ti_color);
hilites[ti_map[c].nh_color] = (char *) alloc(strlen(scratch) + 1);
Strcpy(hilites[ti_map[c].nh_color], scratch);
if (colors >= 16) {
/* Use proper bright colors if terminal supports them. */
scratch = tparm(setf,ti_map[c].ti_color|BRIGHT);
hilites[ti_map[c].nh_bright_color] = (char *) alloc(strlen(scratch) + 1);
Strcpy(hilites[ti_map[c].nh_bright_color], scratch);
} else {
/* For terminals supporting only 8 colors, use bold + color for
* bright colors. */
hilites[ti_map[c].nh_bright_color] = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(hilites[ti_map[c].nh_bright_color], MD);
Strcat(hilites[ti_map[c].nh_bright_color], scratch);
}
}
scratch = tparm(setf,COLOR_WHITE);
hilites[CLR_WHITE] = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(hilites[CLR_WHITE],MD);
Strcat(hilites[CLR_WHITE],scratch);
if (colors >= 16) {
scratch = tparm(setf,COLOR_WHITE|BRIGHT);
hilites[CLR_WHITE] = (char *) alloc(strlen(scratch) + 1);
Strcpy(hilites[CLR_WHITE],scratch);
} else {
scratch = tparm(setf,COLOR_WHITE);
hilites[CLR_WHITE] = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(hilites[CLR_WHITE],MD);
Strcat(hilites[CLR_WHITE],scratch);
}
hilites[CLR_GRAY] = "";
hilites[NO_COLOR] = "";
if (iflags.wc2_darkgray)
{
/* On many terminals, esp. those using classic PC CGA/EGA/VGA
* textmode, specifying "hilight" and "black" simultaneously
* produces a dark shade of gray that is visible against a
* black background. We can use it to represent black objects.
*/
scratch = tparm(setf,COLOR_BLACK);
hilites[CLR_BLACK] = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(hilites[CLR_BLACK],MD);
Strcat(hilites[CLR_BLACK],scratch);
/* On many terminals, esp. those using classic PC CGA/EGA/VGA
* textmode, specifying "hilight" and "black" simultaneously
* produces a dark shade of gray that is visible against a
* black background. We can use it to represent black objects.
*/
if (colors >= 16) {
scratch = tparm(setf,COLOR_BLACK|BRIGHT);
hilites[CLR_BLACK] = (char *) alloc(strlen(scratch) + 1);
Strcpy(hilites[CLR_BLACK],scratch);
} else {
scratch = tparm(setf,COLOR_BLACK);
hilites[CLR_BLACK] = (char *) alloc(strlen(scratch) + length_md + 1);
Strcpy(hilites[CLR_BLACK],MD);
Strcat(hilites[CLR_BLACK],scratch);
}
}
else
{
/* But it's concievable that hilighted black-on-black could
* still be invisible on many others. We substitute blue for
* black.
*/
hilites[CLR_BLACK] = hilites[CLR_BLUE];
/* But it's concievable that hilighted black-on-black could
* still be invisible on many others. We substitute blue for
* black.
*/
hilites[CLR_BLACK] = hilites[CLR_BLUE];
}
}