Skip to content

Commit 111784e

Browse files
committed
Changed 256-colour ANSI to use Xterm colour cube
1 parent f7ce827 commit 111784e

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

MUSHclient.cpp

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,14 @@ STDMETHODIMP CMUSHclientApp::XLocalClass::ShowWindow()
15741574
void Generate256colours (void)
15751575
{
15761576
int red, green, blue;
1577-
// const BYTE values [6] = { 0x00, 0x5F, 0x87, 0xAF, 0xD7, 0xFF };
1577+
const BYTE values [6] = {
1578+
0,
1579+
95,
1580+
95 + 40,
1581+
95 + 40 + 40,
1582+
95 + 40 + 40 + 40,
1583+
95 + 40 + 40 + 40 + 40
1584+
};
15781585

15791586
xterm_256_colours [0] = RGB (0, 0, 0); // (black)
15801587
xterm_256_colours [1] = RGB (128, 0, 0); // (maroon)
@@ -1594,28 +1601,14 @@ void Generate256colours (void)
15941601
xterm_256_colours [14] = RGB (0, 255, 255); // (cyan)
15951602
xterm_256_colours [15] = RGB (255, 255, 255); // (white)
15961603

1597-
/*
15981604
for (red = 0; red < 6; red++)
15991605
for (green = 0; green < 6; green++)
16001606
for (blue = 0; blue < 6; blue++)
1601-
xterm_256_colours [16 + (red * 36) + (blue * 6) + green] =
1602-
RGB (values [red], values [blue], values [green]);
1603-
*/
1604-
1605-
// alternate algorithm - gives even 6x6x6 colour cube
1606-
// there are 6 colours in the cube, but only 5 gaps:
1607-
// Thus the colours will be: 0x00 / 0x33 / 0x66 / 0x99 / 0xCC / 0xFF
1607+
xterm_256_colours [16 + (red * 36) + (green * 6) + blue] =
1608+
RGB (values [red], values [green], values [blue]);
16081609

1609-
const BYTE colour_increment = 255 / 5; // that is, 51 (0x33)
1610-
1611-
for (red = 0; red < 6; red++)
1612-
for (green = 0; green < 6; green++)
1613-
for (blue = 0; blue < 6; blue++)
1614-
xterm_256_colours [16 + (red * 36) + (blue * 6) + green] =
1615-
RGB (red * colour_increment,
1616-
blue * colour_increment,
1617-
green * colour_increment);
1618-
1610+
// see: utils.colourcube in scripting/lua_utils.cpp
1611+
// That lets you change from the xterm colour cube to the Netscape colour cube
16191612

16201613
int grey;
16211614
for (grey = 0; grey < 24; grey++)

0 commit comments

Comments
 (0)