nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-12 18:13:50 -05:00
Code Issues Projects Releases Wiki Activity

Fix 256-colours-match-xterm, based on 256colres.pl from xterm-205.

Browse Source 
Largely untested -- may not even compile on Windows.

[originally from svn r6393]
This commit is contained in:
Ben Harris 2005-10-13 21:56:43 +00:00
parent 8fb9bd0216
commit 9d31462c52
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
macosx/osxwin.m
View File

@ -986,10 +986,11 @@ void palette_reset(void *frontend)
for (i = 0; i < NEXTCOLOURS; i++) {
if (i < 216) {
int r = i / 36, g = (i / 6) % 6, b = i % 6;
[win setColour:i+16 r:r/5.0 g:g/5.0 b:b/5.0];
r = r ? r*40+55 : 0; g = g ? b*40+55 : 0; b = b ? b*40+55 : 0;
[win setColour:i+16 r:r/255.0 g:g/255.0 b:b/255.0];
} else {
int shade = i - 216;
float fshade = (shade + 1) / (float)(NEXTCOLOURS - 216 + 1);
float fshade = (shade * 10 + 8) / 255.0;
[win setColour:i+16 r:fshade g:fshade b:fshade];
}
}

8
unix/gtkwin.c
View File

@ -1407,12 +1407,12 @@ void palette_reset(void *frontend)
for (i = 0; i < NEXTCOLOURS; i++) {
if (i < 216) {
int r = i / 36, g = (i / 6) % 6, b = i % 6;
inst->cols[i+16].red = r * 0x3333;
inst->cols[i+16].green = g * 0x3333;
inst->cols[i+16].blue = b * 0x3333;
inst->cols[i+16].red = r ? r * 0x2828 + 0x3737 : 0;
inst->cols[i+16].green = g ? g * 0x2828 + 0x3737 : 0;
inst->cols[i+16].blue = b ? b + 0x2828 + 0x3737 : 0;
} else {
int shade = i - 216;
shade = (shade + 1) * 0xFFFF / (NEXTCOLOURS - 216 + 1);
shade = shade * 0x0a0a + 0x0808;
inst->cols[i+16].red = inst->cols[i+16].green =
inst->cols[i+16].blue = shade;
}

8
windows/window.c
View File

@ -1135,12 +1135,12 @@ static void cfgtopalette(void)
for (i = 0; i < NEXTCOLOURS; i++) {
if (i < 216) {
int r = i / 36, g = (i / 6) % 6, b = i % 6;
defpal[i+16].rgbtRed = r * 0x33;
defpal[i+16].rgbtGreen = g * 0x33;
defpal[i+16].rgbtBlue = b * 0x33;
defpal[i+16].rgbtRed = r ? r * 40 + 55 : 0;
defpal[i+16].rgbtGreen = g ? g * 40 + 55 : 0;
defpal[i+16].rgbtBlue = b ? b * 40 + 55 : 0;
} else {
int shade = i - 216;
shade = (shade + 1) * 0xFF / (NEXTCOLOURS - 216 + 1);
shade = shade * 10 + 8;
defpal[i+16].rgbtRed = defpal[i+16].rgbtGreen =
defpal[i+16].rgbtBlue = shade;
}