style

Signed-off-by: Mattias Andrée <m@maandree.se>

13 files changed, 81 insertions, 90 deletions

diff --git a/src/Makefile b/src/Makefile
index 9ab321c..164ed4f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ PACKAGE_STRING = redshift-ng 1.13
 
 
 OBJ =\
-	colorramp.o\
+	colourramp.o\
 	config-ini.o\
 	gamma-coopgamma.o\
 	gamma-drm.o\
diff --git a/src/colorramp.c b/src/colourramp.c
index ac197a1..1aa7f27 100644
--- a/src/colorramp.c
+++ b/src/colourramp.c
@@ -1,4 +1,4 @@
-/* colorramp.c -- color temperature calculation source
+/* colourramp.c -- colour temperature calculation source
  * This file is part of redshift-ng.
  * 
  * redshift-ng is free software: you can redistribute it and/or modify
@@ -56,9 +56,9 @@
 	}\
 	\
 	void\
-	colorramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\
-	                        size_t size_r, size_t size_g, size_t size_b,\
-	                        const struct color_setting *setting)\
+	colourramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\
+	                         size_t size_r, size_t size_g, size_t size_b,\
+	                         const struct colour_setting *setting)\
 	{\
 		double r = 1, g = 1, b = 1;\
 		libred_get_colour(setting->temperature, &r, &g, &b);\
diff --git a/src/common.h b/src/common.h
index dedd259..d3cf481 100644
--- a/src/common.h
+++ b/src/common.h
@@ -186,12 +186,12 @@
 
 
 /**
- * Initialiser for `struct color_setting`
+ * Initialiser for `struct colour_setting`
  * 
  * Sets all values to their neutral values (no effects applied)
  */
-#define COLOR_SETTING_NEUTRAL\
-	((struct color_setting){\
+#define COLOUR_SETTING_NEUTRAL\
+	((struct colour_setting){\
 		NEUTRAL_TEMPERATURE,\
 		NEUTRAL_BRIGHTNESS,\
 		{NEUTRAL_GAMMA, NEUTRAL_GAMMA, NEUTRAL_GAMMA}\
@@ -248,7 +248,7 @@ struct location {
 /**
  * Colour setting to apply
  */
-struct color_setting {
+struct colour_setting {
 	/**
 	 * Colour temperature, in Kelvin
 	 */
@@ -277,15 +277,15 @@ struct time_range {
 
 /* Transition scheme.
    The solar elevations at which the transition begins/ends,
-   and the association color settings. */
+   and the association colour settings. */
 struct transition_scheme {
 	double high;
 	double low;
 	int use_time; /* When enabled, ignore elevation and use time ranges. */
 	struct time_range dawn;
 	struct time_range dusk;
-	struct color_setting day;
-	struct color_setting night;
+	struct colour_setting day;
+	struct colour_setting night;
 };
 
 
@@ -318,7 +318,7 @@ struct options {
 
 	/* Temperature to set in manual mode. */
 	unsigned long int temp_set;
-	/* Whether to fade between large skips in color temperature. */
+	/* Whether to fade between large skips in colour temperature. */
 	int use_fade;
 	/* Whether to preserve gamma ramps if supported by gamma method. */
 	int preserve_gamma;
@@ -358,8 +358,8 @@ struct gamma_method {
 
 	/* Restore the adjustment to the state before start was called. */
 	void (*restore)(GAMMA_STATE *state);
-	/* Set a specific color temperature. */
-	int (*set_temperature)(GAMMA_STATE *state, const struct color_setting *setting, int preserve);
+	/* Set a specific colour temperature. */
+	int (*set_temperature)(GAMMA_STATE *state, const struct colour_setting *setting, int preserve);
 };
 
 
@@ -418,9 +418,9 @@ extern const struct location_provider *location_providers[];
 	 * @param  size_b    The number of stops in `gamma_b`
 	 * @param  settings  The colour settings to apply (temperature, brightness, gamma)
 	 */\
-	void colorramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\
-	                             size_t size_r, size_t size_g, size_t size_b,\
-	                             const struct color_setting *setting)
+	void colourramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\
+	                              size_t size_r, size_t size_g, size_t size_b,\
+	                              const struct colour_setting *setting)
 LIST_RAMPS_STOP_VALUE_TYPES(X, ;);
 #undef X
 
diff --git a/src/gamma-coopgamma.c b/src/gamma-coopgamma.c
index db0db4a..ae2c1f9 100644
--- a/src/gamma-coopgamma.c
+++ b/src/gamma-coopgamma.c
@@ -472,7 +472,7 @@ coopgamma_restore(struct gamma_state *state)
 }
 
 static int
-coopgamma_set_temperature(struct gamma_state *state, const struct color_setting *setting, int perserve)
+coopgamma_set_temperature(struct gamma_state *state, const struct colour_setting *setting, int perserve)
 {
 	libcoopgamma_filter_t *filter;
 	libcoopgamma_filter_t *last_filter = NULL;
@@ -497,13 +497,13 @@ coopgamma_set_temperature(struct gamma_state *state, const struct color_setting
 		switch (filter->depth) {
 #define X(SUFFIX, TYPE, MAX, DEPTH)\
 		case DEPTH:\
-			colorramp_fill_##SUFFIX((void *)(filter->ramps.u8.red),\
-						(void *)(filter->ramps.u8.green),\
-						(void *)(filter->ramps.u8.blue),\
-						filter->ramps.u8.red_size,\
-						filter->ramps.u8.green_size,\
-						filter->ramps.u8.blue_size,\
-						setting);\
+			colourramp_fill_##SUFFIX((void *)(filter->ramps.u8.red),\
+			                         (void *)(filter->ramps.u8.green),\
+			                         (void *)(filter->ramps.u8.blue),\
+			                         filter->ramps.u8.red_size,\
+			                         filter->ramps.u8.green_size,\
+			                         filter->ramps.u8.blue_size,\
+			                         setting);\
 			break
 		LIST_RAMPS_STOP_VALUE_TYPES(X, ;);
 #undef X
diff --git a/src/gamma-drm.c b/src/gamma-drm.c
index 877e2a9..73fd718 100644
--- a/src/gamma-drm.c
+++ b/src/gamma-drm.c
@@ -250,7 +250,7 @@ drm_set_option(struct gamma_state *state, const char *key, const char *value)
 
 static int
 drm_set_temperature(
-	struct gamma_state *state, const struct color_setting *setting, int preserve)
+	struct gamma_state *state, const struct colour_setting *setting, int preserve)
 {
 	struct drm_crtc_state *crtcs = state->crtcs;
 	uint32_t last_gamma_size = 0;
@@ -283,10 +283,8 @@ drm_set_temperature(
 			b_gamma[i] = value;
 		}
 
-		colorramp_fill_u16(r_gamma, g_gamma, b_gamma, crtcs->gamma_size,
-				   crtcs->gamma_size, crtcs->gamma_size, setting);
-		drmModeCrtcSetGamma(state->fd, crtcs->crtc_id, crtcs->gamma_size,
-				    r_gamma, g_gamma, b_gamma);
+		colourramp_fill_u16(r_gamma, g_gamma, b_gamma, crtcs->gamma_size, crtcs->gamma_size, crtcs->gamma_size, setting);
+		drmModeCrtcSetGamma(state->fd, crtcs->crtc_id, crtcs->gamma_size, r_gamma, g_gamma, b_gamma);
 	}
 
 	free(r_gamma);
diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c
index 9f3e907..32f6605 100644
--- a/src/gamma-dummy.c
+++ b/src/gamma-dummy.c
@@ -65,7 +65,7 @@ gamma_dummy_set_option(struct gamma_state *state, const char *key, const char *v
 
 static int
 gamma_dummy_set_temperature(
-	struct gamma_state *state, const struct color_setting *setting, int preserve)
+	struct gamma_state *state, const struct colour_setting *setting, int preserve)
 {
 	(void) state;
 	(void) preserve;
diff --git a/src/gamma-quartz.c b/src/gamma-quartz.c
index 3d7cde3..805bb03 100644
--- a/src/gamma-quartz.c
+++ b/src/gamma-quartz.c
@@ -146,7 +146,7 @@ quartz_set_option(struct gamma_state *state, const char *key, const char *value)
 
 static void
 quartz_set_temperature_for_display(struct gamma_state *state, int display_index,
-                                   const color_setting_t *setting, int preserve)
+                                   const colour_setting_t *setting, int preserve)
 {
 	float *gamma_ramps, *gamma_r, *gamma_g, *gamma_b, value;
 	CGDirectDisplayID display = state->displays[display_index].display;
@@ -174,7 +174,7 @@ quartz_set_temperature_for_display(struct gamma_state *state, int display_index,
 		}
 	}
 
-	colorramp_fill_float(gamma_r, gamma_g, gamma_b, ramp_size, ramp_size, ramp_size, setting);
+	colourramp_fill_float(gamma_r, gamma_g, gamma_b, ramp_size, ramp_size, ramp_size, setting);
 
 	error = CGSetDisplayTransferByTable(display, ramp_size, gamma_r, gamma_g, gamma_b);
 	if (error != kCGErrorSuccess) {
@@ -187,14 +187,12 @@ quartz_set_temperature_for_display(struct gamma_state *state, int display_index,
 
 static int
 quartz_set_temperature(
-	struct gamma_state *state, const color_setting_t *setting, int preserve)
+	struct gamma_state *state, const colour_setting_t *setting, int preserve)
 {
 	uint32_t i;
 
-	for (i = 0; i < state->display_count; i++) {
-		quartz_set_temperature_for_display(
-			state, i, setting, preserve);
-	}
+	for (i = 0; i < state->display_count; i++)
+		quartz_set_temperature_for_display(state, i, setting, preserve);
 
 	return 0;
 }
diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index 35171c0..384a9e2 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -328,7 +328,7 @@ randr_set_option(struct gamma_state *state, const char *key, const char *value)
 
 static int
 randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
-                               const struct color_setting *setting, int preserve)
+                               const struct colour_setting *setting, int preserve)
 {
 	xcb_randr_crtc_t crtc;
 	xcb_void_cookie_t gamma_set_cookie;
@@ -369,12 +369,10 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
 		}
 	}
 
-	colorramp_fill_u16(gamma_r, gamma_g, gamma_b, ramp_size,
-			   ramp_size, ramp_size, setting);
+	colourramp_fill_u16(gamma_r, gamma_g, gamma_b, ramp_size, ramp_size, ramp_size, setting);
 
 	/* Set new gamma ramps */
-	gamma_set_cookie = xcb_randr_set_crtc_gamma_checked(state->conn, crtc, ramp_size,
-	                                                    gamma_r, gamma_g, gamma_b);
+	gamma_set_cookie = xcb_randr_set_crtc_gamma_checked(state->conn, crtc, ramp_size, gamma_r, gamma_g, gamma_b);
 	error = xcb_request_check(state->conn, gamma_set_cookie);
 
 	if (error) {
@@ -389,7 +387,7 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
 }
 
 static int
-randr_set_temperature(struct gamma_state *state, const struct color_setting *setting, int preserve)
+randr_set_temperature(struct gamma_state *state, const struct colour_setting *setting, int preserve)
 {
 	int i;
 
diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c
index 13ac50d..7f8434c 100644
--- a/src/gamma-vidmode.c
+++ b/src/gamma-vidmode.c
@@ -153,7 +153,7 @@ vidmode_restore(struct gamma_state *state)
 
 static int
 vidmode_set_temperature(
-	struct gamma_state *state, const struct color_setting *setting, int preserve)
+	struct gamma_state *state, const struct colour_setting *setting, int preserve)
 {
 	uint16_t value, *gamma_ramps, *gamma_r, *gamma_g, *gamma_b;
 	int r, i;
@@ -178,8 +178,7 @@ vidmode_set_temperature(
 		}
 	}
 
-	colorramp_fill_u16(gamma_r, gamma_g, gamma_b, state->ramp_size,
-			   state->ramp_size, state->ramp_size, setting);
+	colourramp_fill_u16(gamma_r, gamma_g, gamma_b, state->ramp_size, state->ramp_size, state->ramp_size, setting);
 
 	/* Set new gamma ramps */
 	r = XF86VidModeSetGammaRamp(state->display, state->screen_num,
diff --git a/src/gamma-w32gdi.c b/src/gamma-w32gdi.c
index ef84744..bc6326c 100644
--- a/src/gamma-w32gdi.c
+++ b/src/gamma-w32gdi.c
@@ -135,7 +135,7 @@ done:
 
 static int
 w32gdi_set_temperature(
-	struct gamma_state *state, const color_setting_t *setting, int preserve)
+	struct gamma_state *state, const colour_setting_t *setting, int preserve)
 {
 	WORD *gamma_ramps, *gamma_r, *gamma_b, *gamma_g, value;
 	HDC hDC;
@@ -168,8 +168,7 @@ w32gdi_set_temperature(
 		}
 	}
 
-	colorramp_fill_u16(gamma_r, gamma_g, gamma_b, GAMMA_RAMP_SIZE,
-	                   GAMMA_RAMP_SIZE, GAMMA_RAMP_SIZE, setting);
+	colourramp_fill_u16(gamma_r, gamma_g, gamma_b, GAMMA_RAMP_SIZE, GAMMA_RAMP_SIZE, GAMMA_RAMP_SIZE, setting);
 
 	/* Set new gamma ramps */
 	for (i = 0; i < MAX_ATTEMPTS; i++) {
diff --git a/src/location-corelocation.m b/src/location-corelocation.m
index 222abe9..f4a3afb 100644
--- a/src/location-corelocation.m
+++ b/src/location-corelocation.m
@@ -227,8 +227,7 @@ location_corelocation_print_help(FILE *f)
 }
 
 static int
-location_corelocation_set_option(
-    struct location_state *state, const char *key, const char *value)
+location_corelocation_set_option(struct location_state *state, const char *key, const char *value)
 {
 	weprintf(_("Unknown method parameter: `%s'."), key);
 	return -1;
diff --git a/src/options.c b/src/options.c
index 8c9c766..ed5886a 100644
--- a/src/options.c
+++ b/src/options.c
@@ -19,7 +19,7 @@
  */
 #include "common.h"
 
-/* Angular elevation of the sun at which the color temperature
+/* Angular elevation of the sun at which the colour temperature
    transition period starts and ends (in degress).
    Transition during twilight, and while the sun is lower than
    3.0 degrees above the horizon. */
@@ -233,7 +233,7 @@ find_gamma_method(const char *name)
 	for (i = 0; gamma_methods[i]; i++)
 		if (!strcasecmp(name, gamma_methods[i]->name))
 			return gamma_methods[i];
-	/* TRANSLATORS: This refers to the method used to adjust colors e.g. VidMode */
+	/* TRANSLATORS: This refers to the method used to adjust colours e.g. VidMode */
 	eprintf(_("Unknown adjustment method `%s'."), name);
 }
 
diff --git a/src/redshift.c b/src/redshift.c
index 295b1d4..d8969af 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -194,10 +194,10 @@ print_location(const struct location *location)
 	       fabs(location->longitude), location->longitude >= 0.0 ? east : west);
 }
 
-/* Interpolate color setting structs given alpha. */
+/* Interpolate colour setting structs given alpha. */
 static void
-interpolate_color_settings(const struct color_setting *first, const struct color_setting *second,
-                           double alpha, struct color_setting *result)
+interpolate_colour_settings(const struct colour_setting *first, const struct colour_setting *second,
+                            double alpha, struct colour_setting *result)
 {
 	int i;
 	alpha = CLAMP(0.0, alpha, 1.0);
@@ -207,17 +207,17 @@ interpolate_color_settings(const struct color_setting *first, const struct color
 		result->gamma[i] = (1.0 - alpha) * first->gamma[i] + alpha * second->gamma[i];
 }
 
-/* Interpolate color setting structs transition scheme. */
+/* Interpolate colour setting structs transition scheme. */
 static void
-interpolate_transition_scheme(const struct transition_scheme *transition, double alpha, struct color_setting *result)
+interpolate_transition_scheme(const struct transition_scheme *transition, double alpha, struct colour_setting *result)
 {
-	interpolate_color_settings(&transition->night, &transition->day, alpha, result);
+	interpolate_colour_settings(&transition->night, &transition->day, alpha, result);
 }
 
-/* Return 1 if color settings have major differences, otherwise 0.
+/* Return 1 if colour settings have major differences, otherwise 0.
    Used to determine if a fade should be applied in continual mode. */
 static int
-color_setting_diff_is_major(const struct color_setting *first, const struct color_setting *second)
+colour_setting_diff_is_major(const struct colour_setting *first, const struct colour_setting *second)
 {
 	return MAX(first->temperature, second->temperature) - MIN(first->temperature, second->temperature) > 25UL ||
 	       fabs(first->brightness - second->brightness) > 0.1 ||
@@ -452,7 +452,7 @@ ease_fade(double t)
 /* Run continual mode loop
    This is the main loop of the continual mode which keeps track of the
    current time and continuously updates the screen to the appropriate
-   color temperature. */
+   colour temperature. */
 static void
 run_continual_mode(const struct location_provider *provider, LOCATION_STATE *location_state,
                    const struct transition_scheme *scheme, const struct gamma_method *method,
@@ -462,9 +462,9 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 	int prev_disabled = 1;
 	int disabled = 0;
 	int location_available = 1;
-	struct color_setting fade_start_interp;
-	struct color_setting prev_target_interp;
-	struct color_setting interp;
+	struct colour_setting fade_start_interp;
+	struct colour_setting prev_target_interp;
+	struct colour_setting interp;
 	struct location loc;
 	int need_location;
 
@@ -478,11 +478,11 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 	signals_install_handlers();
 
-	/* Previous target color setting and current actual color setting.
-	   Actual color setting takes into account the current color fade. */
-	prev_target_interp = COLOR_SETTING_NEUTRAL;
+	/* Previous target colour setting and current actual colour setting.
+	   Actual colour setting takes into account the current colour fade. */
+	prev_target_interp = COLOUR_SETTING_NEUTRAL;
 
-	interp = COLOR_SETTING_NEUTRAL;
+	interp = COLOUR_SETTING_NEUTRAL;
 
 	loc = (struct location){NAN, NAN};
 	need_location = !scheme->use_time;
@@ -504,12 +504,12 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 		printf(_("Brightness: %.2f\n"), interp.brightness);
 	}
 
-	/* Continuously adjust color temperature */
+	/* Continuously adjust colour temperature */
 	for (;;) {
 		double now;
 		enum period period;
 		double transition_prog;
-		struct color_setting target_interp;
+		struct colour_setting target_interp;
 		int delay, loc_fd;
 
 		/* Check to see if disable signal was caught */
@@ -551,12 +551,12 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 			transition_prog = get_transition_progress_from_elevation(scheme, elevation);
 		}
 
-		/* Use transition progress to get target color temperature. */
+		/* Use transition progress to get target colour temperature. */
 		interpolate_transition_scheme(scheme, transition_prog, &target_interp);
 
 		if (disabled) {
 			period = PERIOD_NONE;
-			target_interp = COLOR_SETTING_NEUTRAL;
+			target_interp = COLOUR_SETTING_NEUTRAL;
 		}
 
 		if (done)
@@ -576,8 +576,8 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 		/* Start fade if the parameter differences are too big to apply
 		   instantly. */
 		if (use_fade) {
-			if (fade_length ? color_setting_diff_is_major(&target_interp, &prev_target_interp)
-			                : color_setting_diff_is_major(&interp, &target_interp)) {
+			if (fade_length ? colour_setting_diff_is_major(&target_interp, &prev_target_interp)
+			                : colour_setting_diff_is_major(&interp, &target_interp)) {
 				fade_length = FADE_LENGTH;
 				fade_time = 0;
 				fade_start_interp = interp;
@@ -589,7 +589,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 			double frac = ++fade_time / (double)fade_length;
 			double alpha = CLAMP(0.0, ease_fade(frac), 1.0);
 
-			interpolate_color_settings(&fade_start_interp, &target_interp, alpha, &interp);
+			interpolate_colour_settings(&fade_start_interp, &target_interp, alpha, &interp);
 
 			if (fade_time > fade_length) {
 				fade_time = 0;
@@ -614,7 +614,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 		if (method->set_temperature(method_state, &interp, preserve_gamma) < 0)
 			eprintf(_("Temperature adjustment failed."));
 
-		/* Save period and target color setting as previous */
+		/* Save period and target colour setting as previous */
 		prev_period = period;
 		prev_target_interp = target_interp;
 
@@ -687,7 +687,7 @@ main(int argc, char *argv[])
 	struct location loc = { NAN, NAN };
 	double now, transition_prog;
 	enum period period;
-	struct color_setting color;
+	struct colour_setting colour;
 
 	argv0 = argv[0];
 
@@ -776,14 +776,14 @@ main(int argc, char *argv[])
 			       options.scheme.day.temperature, options.scheme.night.temperature);
 		}
 
-		/* Color temperature */
+		/* Colour temperature */
 		if (!WITHIN(MIN_TEMPERATURE, options.scheme.day.temperature, MAX_TEMPERATURE) ||
 		    !WITHIN(MIN_TEMPERATURE, options.scheme.night.temperature, MAX_TEMPERATURE))
 			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMPERATURE, MAX_TEMPERATURE);
 	}
 
 	if (options.mode == PROGRAM_MODE_MANUAL) {
-		/* Check color temperature to be set */
+		/* Check colour temperature to be set */
 		if (!WITHIN(MIN_TEMPERATURE, options.temp_set, MAX_TEMPERATURE))
 			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMPERATURE, MAX_TEMPERATURE);
 	}
@@ -887,20 +887,20 @@ main(int argc, char *argv[])
 			transition_prog = get_transition_progress_from_elevation(scheme, elevation);
 		}
 
-		/* Use transition progress to set color temperature */
-		interpolate_transition_scheme(scheme, transition_prog, &color);
+		/* Use transition progress to set colour temperature */
+		interpolate_transition_scheme(scheme, transition_prog, &colour);
 
 		if (options.verbose || options.mode == PROGRAM_MODE_PRINT) {
 			print_period(period, transition_prog);
-			printf(_("Color temperature: %luK\n"), color.temperature);
-			printf(_("Brightness: %.2f\n"), color.brightness);
+			printf(_("Color temperature: %luK\n"), colour.temperature);
+			printf(_("Brightness: %.2f\n"), colour.brightness);
 		}
 
 		if (options.mode == PROGRAM_MODE_PRINT)
 			break;
 
 	apply:
-		if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0)
+		if (options.method->set_temperature(method_state, &colour, options.preserve_gamma) < 0)
 			eprintf(_("Temperature adjustment failed."));
 
 #ifndef WINDOWS
@@ -917,12 +917,12 @@ main(int argc, char *argv[])
 	case PROGRAM_MODE_MANUAL:
 		if (options.verbose)
 			printf(_("Color temperature: %luK\n"), options.temp_set);
-		color = scheme->day;
-		color.temperature = options.temp_set;
+		colour = scheme->day;
+		colour.temperature = options.temp_set;
 		goto apply;
 
 	case PROGRAM_MODE_RESET:
-		color = COLOR_SETTING_NEUTRAL;
+		colour = COLOUR_SETTING_NEUTRAL;
 		options.preserve_gamma = 0;
 		goto apply;