fiddlerwoaroof/crawl - Change TZVEM65VHVUXW3XWCXYGLL6VJJYUW4YXHRRTJHQYCJKD2QPVWWRAC

8 color terminals: switch to conditional usage based on terminal type

Apple's Terminal.app sets a TERM_PROGRAM environment variable to "Apple_Terminal". This gives us a good way to detect at runtime whether or not the terminal supports more than 8 colors.

The main reason for checking at runtime is that Mac users are able to run other terminal apps (xterm, rxvt, etc), and should expect to see more than 8 colors in terminals that support it.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on October 12, 2009

TZVEM65VHVUXW3XWCXYGLL6VJJYUW4YXHRRTJHQYCJKD2QPVWWRAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/initfile.cc at line 964 [3.2957258]

B:BD[3.2966291] → [3.2966291:2966320]

B:BD[3.2966320] → [4.396448:396481]

B:BD[4.396481] → [5.795264:795291]

#ifdef USE_8_COLOUR_TERM_MAP
    for (int i = 0; i < 16; i++)
        colour[i] = i % 8;

[3.2966291]

[3.2966384]

	// If USE_8_COLOUR_TERM_MAP is defined, then we force 8 colors.
	// Otherwise, do a check to see if we're using Apple_Terminal.
#ifndef USE_8_COLOUR_TERM_MAP
    if (strcmp(getenv("TERM_PROGRAM"), "Apple_Terminal") == 0) {
#endif
        for (int i = 0; i < 16; i++)
            colour[i] = i % 8;

Replacement in crawl-ref/source/initfile.cc at line 972 [3.2957258]

B:BD[3.2966385] → [5.795292:795342]

∅:D[5.795342] → [3.2966443:2966449]

B:BD[3.2966443] → [3.2966443:2966449]

B:BD[3.2966449] → [4.396482:396515]

B:BD[4.396515] → [5.795343:795366]

    colour[ DARKGREY ] = COL_TO_REPLACE_DARKGREY;
#else
    for (int i = 0; i < 16; i++)
        colour[i] = i;

[3.2966385]

[3.2966509]

        colour[ DARKGREY ] = COL_TO_REPLACE_DARKGREY;
#ifndef USE_8_COLOUR_TERM_MAP
	} else {
        for (int i = 0; i < 16; i++)
            colour[i] = i;
	}

Replacement in crawl-ref/source/AppHdr.h at line 67 [3.4573713]
B:BD[2.6346] → [2.6346:6376]
∅:D[6.3479] → [7.3032:3111]
∅:D[2.6376] → [7.3032:3111]
B:BD[7.3032] → [7.3032:3111]
B:BD[6.3491] → [6.3491:3498]
```
#if defined(TARGET_OS_MACOSX)
    #define USE_8_COLOUR_TERM_MAP
    #define COL_TO_REPLACE_DARKGREY     BLUE
#endif
```
[2.6346]
[6.3498]
```
#define COL_TO_REPLACE_DARKGREY     BLUE
```