nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Centralise palette setup into terminal.c.

Browse Source 
Now terminal.c makes nearly all the decisions about what the colour
palette should actually contain: it does the job of reading the
GUI-configurable colours out of Conf, and also the job of making up
the rest of the xterm-256 palette. The only exception is that TermWin
can provide a method to override some of the default colours, which on
Windows is used to implement the 'Use system colours' config option.

This saves code overall, partly because the front ends don't have to
be able to send palette data back to the Terminal any more (the
Terminal keeps the master copy and can answer palette-query escape
sequences from its own knowledge), and also because now there's only
one copy of the xterm-256 palette setup code (previously gtkwin.c and
window.c each had their own version of it).

In this rewrite, I've also introduced a multi-layered storage system
for the palette data in Terminal. One layer contains the palette
information derived from Conf; the next contains platform overrides
(currently just Windows's 'Use system colours'); the last one contains
overrides set by escape sequences in the middle of the session. The
topmost two layers can each _conditionally_ override the ones below.
As a result, if a server-side application manually resets (say) the
default fg and bg colours in mid-session to something that works well
in a particular application, those changes won't be wiped out by a
change in the Windows system colours or the Conf, which they would
have been before. Instead, changes in Conf or the system colours alter
the lower layers of the structure, but then when palette_rebuild is
called, the upper layer continues to override them, until a palette
reset (ESC]R) or terminal reset (e.g. ESC c) removes those upper-layer
changes. This seems like a more consistent strategy, in that the same
set of configuration settings will produce the same end result
regardless of what order they were applied in.

The palette-related methods in TermWin have had a total rework.
palette_get and palette_reset are both gone; palette_set can now set a
contiguous range of colours in one go; and the new
palette_get_overrides replaces window.c's old systopalette().
This commit is contained in:
Simon Tatham
2021-02-07 19:59:21 +00:00
parent cd32ef8733
commit ca9cd983e1
6 changed files with 309 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
unix/gtkwin.c
View File

@ -2518,26 +2518,6 @@ static void gtkwin_request_resize(TermWin *tw, int w, int h)
}
static void real_palette_set(GtkFrontend *inst, unsigned n,
int r, int g, int b)
{
inst->cols[n].red = r * 0x0101;
inst->cols[n].green = g * 0x0101;
inst->cols[n].blue = b * 0x0101;
#if !GTK_CHECK_VERSION(3,0,0)
{
gboolean success[1];
gdk_colormap_free_colors(inst->colmap, inst->cols + n, 1);
gdk_colormap_alloc_colors(inst->colmap, inst->cols + n, 1,
false, true, success);
if (!success[0])
g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n",
appname, n, r, g, b);
}
#endif
}
#if GTK_CHECK_VERSION(3,0,0)
char *colour_to_css(const GdkColor *col)
{
@ -2581,36 +2561,13 @@ void set_window_background(GtkFrontend *inst)
set_gtk_widget_background(GTK_WIDGET(inst->window), &inst->cols[258]);
}
static void gtkwin_palette_set(TermWin *tw, unsigned n, int r, int g, int b)
static void gtkwin_palette_set(TermWin *tw, unsigned start, unsigned ncolours,
const rgb *colours)
{
GtkFrontend *inst = container_of(tw, GtkFrontend, termwin);
if (n >= OSC4_NCOLOURS)
return;
real_palette_set(inst, n, r, g, b);
if (n == OSC4_COLOUR_bg) {
/* Default Background changed. Ensure space between text area and
* window border is redrawn */
set_window_background(inst);
draw_backing_rect(inst);
gtk_widget_queue_draw(inst->area);
}
}
static bool gtkwin_palette_get(TermWin *tw, unsigned n, int *r, int *g, int *b)
{
GtkFrontend *inst = container_of(tw, GtkFrontend, termwin);
if (n >= OSC4_NCOLOURS)
return false;
*r = inst->cols[n].red >> 8;
*g = inst->cols[n].green >> 8;
*b = inst->cols[n].blue >> 8;
return true;
}
static void gtkwin_palette_reset(TermWin *tw)
{
GtkFrontend *inst = container_of(tw, GtkFrontend, termwin);
int i;
assert(start <= OSC4_NCOLOURS);
assert(ncolours <= OSC4_NCOLOURS - start);
#if !GTK_CHECK_VERSION(3,0,0)
if (!inst->colmap) {
@ -2620,37 +2577,24 @@ static void gtkwin_palette_reset(TermWin *tw)
}
#endif
for (i = 0; i < CONF_NCOLOURS; i++) {
int w = colour_indices_conf_to_osc4[i];
inst->cols[w].red =
conf_get_int_int(inst->conf, CONF_colours, i*3+0) * 0x0101;
inst->cols[w].green =
conf_get_int_int(inst->conf, CONF_colours, i*3+1) * 0x0101;
inst->cols[w].blue =
conf_get_int_int(inst->conf, CONF_colours, i*3+2) * 0x0101;
}
for (unsigned i = 0; i < ncolours; i++) {
const rgb *in = &colours[i];
GdkColor *out = &inst->cols[start + i];
for (i = 0; i < 216; i++) {
int r = i / 36, g = (i / 6) % 6, b = i % 6;
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;
}
for (i = 0; i < 24; i++) {
int shade = i * 0x0a0a + 0x0808;
inst->cols[i+232].red = inst->cols[i+232].green =
inst->cols[i+232].blue = shade;
out->red = in->r * 0x0101;
out->green = in->g * 0x0101;
out->blue = in->b * 0x0101;
}
#if !GTK_CHECK_VERSION(3,0,0)
{
gboolean success[OSC4_NCOLOURS];
gdk_colormap_alloc_colors(inst->colmap, inst->cols, OSC4_NCOLOURS,
false, true, success);
for (i = 0; i < OSC4_NCOLOURS; i++) {
gdk_colormap_alloc_colors(inst->colmap + start, inst->cols + start,
ncolours, false, true, success);
for (unsigned i = 0; i < ncolours; i++) {
if (!success[i])
g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n",
appname, i,
appname, start + i,
conf_get_int_int(inst->conf, CONF_colours, i*3+0),
conf_get_int_int(inst->conf, CONF_colours, i*3+1),
conf_get_int_int(inst->conf, CONF_colours, i*3+2));
@ -2658,15 +2602,24 @@ static void gtkwin_palette_reset(TermWin *tw)
}
#endif
/* Since Default Background may have changed, ensure that space
* between text area and window border is refreshed. */
set_window_background(inst);
if (inst->area && gtk_widget_get_window(inst->area)) {
draw_backing_rect(inst);
gtk_widget_queue_draw(inst->area);
if (start <= OSC4_COLOUR_bg && OSC4_COLOUR_bg < start + ncolours) {
/* Default Background has changed, so ensure that space between text
* area and window border is refreshed. */
set_window_background(inst);
if (inst->area && gtk_widget_get_window(inst->area)) {
draw_backing_rect(inst);
gtk_widget_queue_draw(inst->area);
}
}
}
static void gtkwin_palette_get_overrides(TermWin *tw)
{
/* GTK has no analogue of Windows's 'standard system colours', so GTK PuTTY
* has no config option to override the normally configured colours from
* it */
}
static struct clipboard_state *clipboard_from_atom(
GtkFrontend *inst, GdkAtom atom)
{
@ -4616,7 +4569,6 @@ static void after_change_settings_dialog(void *vctx, int retval)
*(struct after_change_settings_dialog_ctx *)vctx;
GtkFrontend *inst = ctx.inst;
Conf *oldconf = inst->conf, *newconf = ctx.newconf;
int i, j;
bool need_size;
sfree(vctx); /* we've copied this already */
@ -4645,37 +4597,6 @@ static void after_change_settings_dialog(void *vctx, int retval)
cache_conf_values(inst);
/*
* Just setting inst->conf is sufficient to cause colour
* setting changes to appear on the next ESC]R palette
* reset. But we should also check whether any colour
* settings have been changed, and revert the ones that have
* to the new default, on the assumption that the user is
* most likely to want an immediate update.
*/
for (i = 0; i < CONF_NCOLOURS; i++) {
for (j = 0; j < 3; j++)
if (conf_get_int_int(oldconf, CONF_colours, i*3+j) !=
conf_get_int_int(newconf, CONF_colours, i*3+j))
break;
if (j < 3) {
real_palette_set(inst, colour_indices_conf_to_osc4[i],
conf_get_int_int(newconf,CONF_colours,i*3+0),
conf_get_int_int(newconf,CONF_colours,i*3+1),
conf_get_int_int(newconf,CONF_colours,i*3+2));
/*
* If the default background has changed, we must
* repaint the space in between the window border
* and the text area.
*/
if (i == CONF_COLOUR_bg) {
set_window_background(inst);
draw_backing_rect(inst);
}
}
}
need_size = false;
/*
@ -5130,9 +5051,8 @@ static const TermWinVtable gtk_termwin_vt = {
.set_maximised = gtkwin_set_maximised,
.move = gtkwin_move,
.set_zorder = gtkwin_set_zorder,
.palette_get = gtkwin_palette_get,
.palette_set = gtkwin_palette_set,
.palette_reset = gtkwin_palette_reset,
.palette_get_overrides = gtkwin_palette_get_overrides,
.get_pos = gtkwin_get_pos,
.get_pixels = gtkwin_get_pixels,
};
@ -5243,11 +5163,6 @@ void new_session_window(Conf *conf, const char *geometry_string)
}
}
/*
* Set up the colour map.
*/
win_palette_reset(&inst->termwin);
inst->width = conf_get_int(inst->conf, CONF_width);
inst->height = conf_get_int(inst->conf, CONF_height);
cache_conf_values(inst);