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

Bring some order to colour palette indexing.

Browse Source 
There are three separate indexing schemes in use by various bits of
the PuTTY front ends, and _none_ of them was clearly documented, let
alone all in the same place. Worse, functions that looked obviously
related, like win_palette_set and win_palette_get, used different
encodings.

Now all the encodings are defined together in putty.h, with
explanation of why there are three in the first place and clear
documentation of where each one is used; terminal.c provides mapping
tables that convert between them; the terminology is consistent
throughout; and win_palette_set has been converted to use the sensible
encoding.
This commit is contained in:
Simon Tatham
2021-02-07 19:59:20 +00:00
parent 61571376cc
commit da3197f395
6 changed files with 256 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
terminal.c
View File

@ -132,6 +132,24 @@ static void unlineptr(termline *line)
freetermline(line);
}
const int colour_indices_conf_to_oscp[CONF_NCOLOURS] = {
#define COLOUR_ENTRY(id,name) OSCP_COLOUR_##id,
CONF_COLOUR_LIST(COLOUR_ENTRY)
#undef COLOUR_ENTRY
};
const int colour_indices_conf_to_osc4[CONF_NCOLOURS] = {
#define COLOUR_ENTRY(id,name) OSC4_COLOUR_##id,
CONF_COLOUR_LIST(COLOUR_ENTRY)
#undef COLOUR_ENTRY
};
const int colour_indices_oscp_to_osc4[OSCP_NCOLOURS] = {
#define COLOUR_ENTRY(id) OSC4_COLOUR_##id,
OSCP_COLOUR_LIST(COLOUR_ENTRY)
#undef COLOUR_ENTRY
};
#ifdef TERM_CC_DIAGS
/*
* Diagnostic function: verify that a termline has a correct
@ -4868,8 +4886,13 @@ static void term_out(Terminal *term)
}
term->osc_string[term->osc_strlen++] = val;
if (term->osc_strlen >= 7) {
unsigned oscp_index = term->osc_string[0];
assert(oscp_index < OSCP_NCOLOURS);
unsigned osc4_index =
colour_indices_oscp_to_osc4[oscp_index];
win_palette_set(
term->win, term->osc_string[0],
term->win, osc4_index,
term->osc_string[1] * 16 + term->osc_string[2],
term->osc_string[3] * 16 + term->osc_string[4],
term->osc_string[5] * 16 + term->osc_string[6]);