From 90e42d4cdedf999a5c996ff4ac1353ecee280ea5 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 18 May 2005 09:04:47 +0000 Subject: Move the colour configuration into midend.c so that it becomes cross-platform, and rename the environment variables so that they follow the puzzle name. Should allow a static environment configuration for each puzzle. Also introduced a _PRESETS variable for people whose favourite configuration isn't on the Type menu by default. [originally from svn r5801] --- gtk.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'gtk.c') diff --git a/gtk.c b/gtk.c index 6de9fcf..55bc179 100644 --- a/gtk.c +++ b/gtk.c @@ -1143,24 +1143,9 @@ static frontend *new_window(char *game_id, char **error) fe->ncolours = ncolours; fe->colours = snewn(ncolours, GdkColor); for (i = 0; i < ncolours; i++) { - /* - * Just for Gareth: if you dislike any of the standard - * colours, here's your chance to configure them in a - * really hacky way. - */ - char buf[80], *e; - unsigned int r, g, b; - sprintf(buf, "PUZZLE_COLOUR_%d", i); - if ((e = getenv(buf)) != NULL && - sscanf(e, "%2x%2x%2x", &r, &g, &b) == 3) { - fe->colours[i].red = r * 0x101; - fe->colours[i].green = g * 0x101; - fe->colours[i].blue = b * 0x101; - } else { - fe->colours[i].red = colours[i*3] * 0xFFFF; - fe->colours[i].green = colours[i*3+1] * 0xFFFF; - fe->colours[i].blue = colours[i*3+2] * 0xFFFF; - } + fe->colours[i].red = colours[i*3] * 0xFFFF; + fe->colours[i].green = colours[i*3+1] * 0xFFFF; + fe->colours[i].blue = colours[i*3+2] * 0xFFFF; } success = snewn(ncolours, gboolean); gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours, -- cgit v1.1