1 files changed, 138 insertions, 519 deletions

diff --git a/src/redshift.c b/src/redshift.c
index d8969af..9a44b0b 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -1,5 +1,7 @@
-/* redshift.c -- Main program source
- * This file is part of redshift-ng.
+/* redshift-ng - Automatically adjust display colour temperature according the Sun
+ * 
+ * Copyright (c) 2009-2018        Jon Lund Steffensen <jonlst@gmail.com>
+ * Copyright (c) 2014-2016, 2025  Mattias Andrée <m@maandree.se>
  * 
  * redshift-ng is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,9 +15,6 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with redshift-ng.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Copyright (c) 2009-2017  Jon Lund Steffensen <jonlst@gmail.com>
- * Copyright (c) 2025       Mattias Andrée <m@maandree.se>
  */
 #include "common.h"
 
@@ -43,42 +42,6 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); }
 #define FADE_LENGTH  40
 
 
-const struct gamma_method *gamma_methods[] = {
-#ifdef ENABLE_COOPGAMMA
-	&coopgamma_gamma_method,
-#endif
-#ifdef ENABLE_DRM
-	&drm_gamma_method,
-#endif
-#ifdef ENABLE_RANDR
-	&randr_gamma_method,
-#endif
-#ifdef ENABLE_VIDMODE
-	&vidmode_gamma_method,
-#endif
-#ifdef ENABLE_QUARTZ
-	&quartz_gamma_method,
-#endif
-#ifdef ENABLE_WINGDI
-	&w32gdi_gamma_method,
-#endif
-	&dummy_gamma_method,
-	NULL
-};
-
-
-const struct location_provider *location_providers[] = {
-#ifdef ENABLE_GEOCLUE2
-	&geoclue2_location_provider,
-#endif
-#ifdef ENABLE_CORELOCATION
-	&corelocation_location_provider,
-#endif
-	&manual_location_provider,
-	NULL
-};
-
-
 /* Names of periods of day */
 static const char *period_names[] = {
 	/* TRANSLATORS: Name printed when period of day is unknown */
@@ -103,72 +66,47 @@ exact_eq(double a, double b)
 #endif
 
 
-/* Determine which period we are currently in based on time offset. */
-static enum period
-get_period_from_time(const struct transition_scheme *transition, int time_offset)
-{
-	if (time_offset < transition->dawn.start || time_offset >= transition->dusk.end)
-		return PERIOD_NIGHT;
-	else if (time_offset >= transition->dawn.end && time_offset < transition->dusk.start)
-		return PERIOD_DAYTIME;
-	else
-		return PERIOD_TRANSITION;
-}
-
-/* Determine which period we are currently in based on solar elevation. */
-static enum period
-get_period_from_elevation(const struct transition_scheme *transition, double elevation)
-{
-	if (elevation < transition->low)
-		return PERIOD_NIGHT;
-	else if (elevation < transition->high)
-		return PERIOD_TRANSITION;
-	else
-		return PERIOD_DAYTIME;
-}
-
-/* Determine how far through the transition we are based on time offset. */
-static double
-get_transition_progress_from_time(const struct transition_scheme *transition, int time_offset)
+/**
+ * Suspend the process for a short time
+ *
+ * The process may be resumed earily, specifically
+ * if it receives a signal
+ * 
+ * @param  msecs  The number of milliseconds to sleep
+ */
+static void
+millisleep(unsigned int msecs)
 {
-	if (time_offset < transition->dawn.start || time_offset >= transition->dusk.end)
-		return 0.0;
-	else if (time_offset < transition->dawn.end)
-		return (transition->dawn.start - time_offset) / (double)(transition->dawn.start - transition->dawn.end);
-	else if (time_offset > transition->dusk.start)
-		return (transition->dusk.end - time_offset) / (double)(transition->dusk.end - transition->dusk.start);
-	else
-		return 1.0;
+#ifdef WINDOWS
+	Sleep(msecs); /* TODO [Windows] not interruptible */
+#else
+	struct timespec ts;
+	ts.tv_sec = (time_t)(msecs / 1000U);
+	ts.tv_nsec = (long)(msecs % 1000U) * 1000000L;
+	nanosleep(&ts, NULL);
+#endif
 }
 
-/* Determine how far through the transition we are based on elevation. */
-static double
-get_transition_progress_from_elevation(const struct transition_scheme *transition, double elevation)
-{
-	if (elevation < transition->low)
-		return 0.0;
-	else if (elevation < transition->high)
-		return (transition->low - elevation) / (transition->low - transition->high);
-	else
-		return 1.0;
-}
 
 /* Return number of seconds since midnight from timestamp. */
-static int
-get_seconds_since_midnight(double timestamp)
+static time_t
+get_time_since_midnight(void)
 {
-	time_t t = (time_t)timestamp;
+	time_t t = time(NULL);
 	struct tm tm;
 	localtime_r(&t, &tm);
-	return tm.tm_sec + tm.tm_min * 60 + tm.tm_hour * 3600;
+	t  = (time_t)tm.tm_sec;
+	t += (time_t)tm.tm_min * 60;
+	t += (time_t)tm.tm_hour * 3600;
+	return t;
 }
 
 /* Print verbose description of the given period. */
 static void
-print_period(enum period period, double transition)
+print_period(enum period period, double day_level)
 {
 	if (period == PERIOD_TRANSITION)
-		printf(_("Period: %s (%.2f%% day)\n"), gettext(period_names[period]), transition * 100);
+		printf(_("Period: %s (%.2f%% day)\n"), gettext(period_names[period]), day_level * 100);
 	else
 		printf(_("Period: %s\n"), gettext(period_names[period]));
 }
@@ -207,13 +145,6 @@ interpolate_colour_settings(const struct colour_setting *first, const struct col
 		result->gamma[i] = (1.0 - alpha) * first->gamma[i] + alpha * second->gamma[i];
 }
 
-/* Interpolate colour setting structs transition scheme. */
-static void
-interpolate_transition_scheme(const struct transition_scheme *transition, double alpha, struct colour_setting *result)
-{
-	interpolate_colour_settings(&transition->night, &transition->day, alpha, result);
-}
-
 /* Return 1 if colour settings have major differences, otherwise 0.
    Used to determine if a fade should be applied in continual mode. */
 static int
@@ -226,153 +157,69 @@ colour_setting_diff_is_major(const struct colour_setting *first, const struct co
 	       fabs(first->gamma[2] - second->gamma[2]) > 0.1;
 }
 
-
-static int
-provider_try_start(const struct location_provider *provider, LOCATION_STATE **state,
-                   struct config_ini_state *config, char *args)
-{
-	const char *manual_keys[] = {"lat", "lon"};
-	struct config_ini_section *section;
-	struct config_ini_setting *setting;
-	char *next_arg, *value;
-	const char *key;
-	int i;
-
-	if (provider->init(state) < 0) {
-		weprintf(_("Initialization of %s failed."), provider->name);
-		return -1;
-	}
-
-	/* Set provider options from config file. */
-	if ((section = config_ini_get_section(config, provider->name))) {
-		for (setting = section->settings; setting; setting = setting->next) {
-			if (provider->set_option(*state, setting->name, setting->value) < 0) {
-				provider->free(*state);
-				weprintf(_("Failed to set %s option."), provider->name);
-				/* TRANSLATORS: `help' must not be translated. */
-				weprintf(_("Try `-l %s:help' for more information."), provider->name);
-				return -1;
-			}
-		}
-	}
-
-	/* Set provider options from command line. */
-	for (i = 0; args; i++) {
-		next_arg = strchr(args, ':');
-		if (next_arg)
-			*next_arg++ = '\0';
-
-		key = args;
-		value = strchr(args, '=');
-		if (!value) {
-			/* The options for the "manual" method can be set
-			   without keys on the command line for convencience
-			   and for backwards compatability. We add the proper
-			   keys here before calling set_option(). */
-			if (!strcmp(provider->name, "manual") && i < ELEMSOF(manual_keys)) {
-				key = manual_keys[i];
-				value = args;
-			} else {
-				weprintf(_("Failed to parse option `%s'."), args);
-				return -1;
-			}
-		} else {
-			*value++ = '\0';
-		}
-
-		if (provider->set_option(*state, key, value) < 0) {
-			provider->free(*state);
-			weprintf(_("Failed to set %s option."), provider->name);
-			/* TRANSLATORS: `help' must not be translated. */
-			weprintf(_("Try `-l %s:help' for more information."), provider->name);
-			return -1;
-		}
-
-		args = next_arg;
-	}
-
-	/* Start provider. */
-	if (provider->start(*state) < 0) {
-		provider->free(*state);
-		weprintf(_("Failed to start provider %s.\n"), provider->name);
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
-		 enum program_mode mode, struct config_ini_state *config, char *args)
+/**
+ * Get the current period of day and the colour settings
+ * applicable to the current time of the day
+ * 
+ * @param  location       Geographical user location
+ * @param  colour_out     Output parameter for the colour settings
+ * @param  period_out     Output parameter for the period of the day
+ * @param  day_level_out  Output parameter for the dayness level
+ * @param  verbose        Whether the application is running in verbose mode
+ */
+static void
+get_colour_settings(const struct location *location, struct colour_setting *colour_out,
+                    enum period *period_out, double *day_level_out, int verbose)
 {
-	struct config_ini_section *section;
-	struct config_ini_setting *setting;
-	char *next_arg, *value;
-	const char *key;
-
-	if (method->init(state) < 0) {
-		weprintf(_("Initialization of %s failed."), method->name);
-		return -1;
-	}
-
-	/* Set method options from config file. */
-	if ((section = config_ini_get_section(config, method->name))) {
-		for (setting = section->settings; setting; setting = setting->next) {
-			if (method->set_option(*state, setting->name, setting->value) < 0) {
-				method->free(*state);
-				weprintf(_("Failed to set %s option."), method->name);
-				/* TRANSLATORS: `help' must not be translated. */
-				weprintf(_("Try `-m %s:help' for more information.\n"), method->name); /* TODO \n */
-				return -1;
-			}
+	time_t time_offset;
+	double t, elevation;
+
+	/* Get dayness level */
+	if (scheme.type == CLOCK_SCHEME) {
+		time_offset = get_time_since_midnight();
+		while (time_offset >= scheme.time.periods->next->start)
+			scheme.time.periods = scheme.time.periods->next;
+		time_offset -= scheme.time.periods->start;
+		if (time_offset < 0)
+			time_offset += ONE_DAY;
+		t = (double)time_offset;
+		*day_level_out = fma(t, scheme.time.periods->diff_over_duration, scheme.time.periods->day_level);
+
+	} else if (scheme.type == SOLAR_SCHEME) {
+		if (libred_solar_elevation(location->latitude, location->longitude, &elevation))
+			eprintf("libred_solar_elevation:");
+		if (verbose) {
+			/* TRANSLATORS: Append degree symbol if possible. */
+			printf(_("Solar elevation: %f\n"), elevation);
 		}
+		*day_level_out = (elevation - scheme.elevation.low) / scheme.elevation.range;
+
+	} else {
+		/* Static scheme, no dayness-level or peroid; day_settings == nigh_settings, use either */
+		*day_level_out = NAN;
+		*period_out = PERIOD_NONE;
+		*colour_out = day_settings;
+		return;
 	}
 
-	/* Set method options from command line. */
-	while (args) {
-		next_arg = strchr(args, ':');
-		if (next_arg)
-			*next_arg++ = '\0';
-
-		key = args;
-		value = strchr(args, '=');
-		if (!value) {
-			weprintf(_("Failed to parse option `%s'."), args);
-			return -1;
-		}
-		*value++ = '\0';
-
-		if (method->set_option(*state, key, value) < 0) {
-			method->free(*state);
-			weprintf(_("Failed to set %s option."), method->name);
-			/* TRANSLATORS: `help' must not be translated. */
-			weprintf(_("Try -m %s:help' for more information.\n"), method->name); /* TODO missing ` and \n */
-			return -1;
-		}
+	/* Clamp dayness level and get colour */
+	if (*day_level_out <= 0.0) {
+		*day_level_out = 0.0;
+		*period_out = PERIOD_NIGHT;
+		*colour_out = night_settings;
 
-		args = next_arg;
-	}
+	} else if (*day_level_out >= 1.0) {
+		*day_level_out = 1.0;
+		*period_out = PERIOD_DAYTIME;
+		*colour_out = day_settings;
 
-	/* Start method. */
-	if (method->start(*state, mode) < 0) {
-		method->free(*state);
-		weprintf(_("Failed to start adjustment method %s.\n"), method->name); /* TODO \n */
-		return -1;
+	} else {
+		*period_out = PERIOD_TRANSITION;
+		interpolate_colour_settings(&night_settings, &day_settings, *day_level_out, colour_out);
 	}
-
-	return 0;
 }
 
 
-/* Check whether gamma is within allowed levels. */
-static int
-gamma_is_valid(const double gamma[3])
-{
-	return WITHIN(MIN_GAMMA, gamma[0], MAX_GAMMA) &&
-	       WITHIN(MIN_GAMMA, gamma[1], MAX_GAMMA) &&
-	       WITHIN(MIN_GAMMA, gamma[2], MAX_GAMMA);
-}
-
 /* Check whether location is valid.
    Prints error message on stderr and returns 0 if invalid, otherwise
    returns 1. */
@@ -381,62 +228,17 @@ location_is_valid(const struct location *location)
 {
 	if (!WITHIN(MIN_LATITUDE, location->latitude, MAX_LATITUDE)) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LATITUDE, MAX_LATITUDE); /* TODO \n */
+		weprintf(_("Latitude must be between %.1f and %.1f."), MIN_LATITUDE, MAX_LATITUDE);
 		return 0;
 	}
 	if (!WITHIN(MIN_LONGITUDE, location->longitude, MAX_LONGITUDE)) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LONGITUDE, MAX_LONGITUDE); /* TODO \n */
+		weprintf(_("Longitude must be between %.1f and %.1f."), MIN_LONGITUDE, MAX_LONGITUDE);
 		return 0;
 	}
 	return 1;
 }
 
-/* Wait for location to become available from provider.
-   Waits until timeout (milliseconds) has elapsed or forever if timeout
-   is -1. Writes location to loc. Returns -1 on error,
-   0 if timeout was reached, 1 if location became available. */
-static int
-provider_get_location(const struct location_provider *provider, LOCATION_STATE *state, int timeout, struct location *loc)
-{
-	int r, available, loc_fd;
-	struct pollfd pollfds[1];
-	double now, later;
-
-	do {
-		loc_fd = provider->get_fd(state);
-		if (loc_fd >= 0) {
-			/* Provider is dynamic. */
-			/* TODO: This should use a monotonic time source. */
-			now = systemtime_get_time();
-
-			/* Poll on file descriptor until ready. */
-			pollfds[0].fd = loc_fd;
-			pollfds[0].events = POLLIN;
-			r = poll(pollfds, 1, timeout);
-			if (r < 0) {
-				weprintf("poll {{.fd=<location provider>, .events=EPOLLIN}} 1 %i:", timeout);
-				return -1;
-			} else if (r == 0) {
-				return 0;
-			}
-
-			later = systemtime_get_time();
-
-			/* Adjust timeout by elapsed time */
-			if (timeout >= 0) {
-				timeout -= (later - now) * 1000;
-				timeout = MAX(timeout, 0);
-			}
-		}
-
-		if (provider->handle(state, loc, &available) < 0)
-			return -1;
-	} while (!available);
-
-	return 1;
-}
-
 /* Easing function for fade.
    See https://github.com/mietek/ease-tween */
 static double
@@ -455,8 +257,8 @@ ease_fade(double t)
    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,
-                   GAMMA_STATE *method_state, int use_fade, int preserve_gamma, int verbose)
+                   const struct gamma_method *method, GAMMA_STATE *method_state, int use_fade,
+                   int preserve_gamma, int verbose)
 {
 	int done = 0;
 	int prev_disabled = 1;
@@ -466,7 +268,6 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 	struct colour_setting prev_target_interp;
 	struct colour_setting interp;
 	struct location loc;
-	int need_location;
 
 	/* Short fade parameters */
 	int fade_length = 0;
@@ -476,7 +277,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 	   the values did not change. */
 	enum period prev_period = PERIOD_NONE;
 
-	signals_install_handlers();
+	install_signal_handlers();
 
 	/* Previous target colour setting and current actual colour setting.
 	   Actual colour setting takes into account the current colour fade. */
@@ -485,16 +286,15 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 	interp = COLOUR_SETTING_NEUTRAL;
 
 	loc = (struct location){NAN, NAN};
-	need_location = !scheme->use_time;
-	if (need_location) {
-		weprintf(_("Waiting for initial location to become available...\n")); /* TODO \n */
+	if (scheme.type == SOLAR_SCHEME) {
+		weprintf(_("Waiting for initial location to become available..."));
 
 		/* Get initial location from provider */
-		if (provider_get_location(provider, location_state, -1, &loc) < 0)
+		if (get_location(provider, location_state, -1, &loc) < 0)
 			eprintf(_("Unable to get location from provider."));
 
 		if (!location_is_valid(&loc))
-			eprintf(_("Invalid location returned from provider.\n")); /* TODO \n */
+			eprintf(_("Invalid location returned from provider."));
 
 		print_location(&loc);
 	}
@@ -506,9 +306,8 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 	/* Continuously adjust colour temperature */
 	for (;;) {
-		double now;
 		enum period period;
-		double transition_prog;
+		double day_level;
 		struct colour_setting target_interp;
 		int delay, loc_fd;
 
@@ -533,26 +332,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 		prev_disabled = disabled;
 
-		/* Read timestamp */
-		now = systemtime_get_time();
-
-		if (scheme->use_time) {
-			int time_offset = get_seconds_since_midnight(now);
-
-			period = get_period_from_time(scheme, time_offset);
-			transition_prog = get_transition_progress_from_time(scheme, time_offset);
-		} else {
-			/* Current angular elevation of the sun */
-			double elevation;
-			if (libred_solar_elevation(loc.latitude, loc.longitude, &elevation))
-				eprintf("libred_solar_elevation:");
-
-			period = get_period_from_elevation(scheme, elevation);
-			transition_prog = get_transition_progress_from_elevation(scheme, elevation);
-		}
-
-		/* Use transition progress to get target colour temperature. */
-		interpolate_transition_scheme(scheme, transition_prog, &target_interp);
+		get_colour_settings(&loc, &target_interp, &period, &day_level, verbose);
 
 		if (disabled) {
 			period = PERIOD_NONE;
@@ -567,21 +347,18 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 		   print the progress, so we always print it in
 		   that case. */
 		if (verbose && (period != prev_period || period == PERIOD_TRANSITION))
-			print_period(period, transition_prog);
+			print_period(period, day_level);
 
 		/* Activate hooks if period changed */
 		if (period != prev_period)
-			hooks_signal_period_change(prev_period, period);
+			run_period_change_hooks(prev_period, period);
 
 		/* Start fade if the parameter differences are too big to apply
 		   instantly. */
-		if (use_fade) {
-			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;
-			}
+		if (use_fade && colour_setting_diff_is_major(&target_interp, fade_length ? &prev_target_interp : &interp)) {
+			fade_length = FADE_LENGTH;
+			fade_time = 0;
+			fade_start_interp = interp;
 		}
 
 		/* Handle ongoing fade */
@@ -622,7 +399,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 		delay = fade_length ? SLEEP_DURATION_SHORT : SLEEP_DURATION;
 
 		/* Update location. */
-		loc_fd = need_location ? provider->get_fd(location_state) : -1;
+		loc_fd = scheme.type == SOLAR_SCHEME ? provider->get_fd(location_state) : -1;
 
 		if (loc_fd >= 0) {
 			struct pollfd pollfds[1];
@@ -634,22 +411,23 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 			pollfds[0].events = POLLIN;
 			r = poll(pollfds, 1, delay);
 			if (r < 0) {
+#ifndef WINDOWS
 				if (errno == EINTR)
 					continue;
+#endif
 				weprintf("poll:");
 				eprintf(_("Unable to get location from provider."));
 			} else if (!r) {
 				continue;
 			}
 
-			/* Get new location and availability
-			   information. */
+			/* Get new location and availability information. */
 			if (provider->handle(location_state, &new_loc, &new_available) < 0)
 				eprintf(_("Unable to get location from provider."));
 
 			if (!new_available && new_available != location_available) {
-				weprintf(_("Location is temporarily unavailable; Using previous" /* TODO captial U efter ; and \n*/
-				           " location until it becomes available...\n"));
+				weprintf(_("Location is temporarily unavailable; using previous"
+				           " location until it becomes available..."));
 			}
 
 			if (new_available &&
@@ -665,7 +443,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 			if (!location_is_valid(&loc))
 				eprintf(_("Invalid location returned from provider."));
 		} else {
-			systemtime_msleep(delay);
+			millisleep(delay);
 		}
 	}
 
@@ -677,15 +455,11 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 int
 main(int argc, char *argv[])
 {
-	struct options options;
-	struct config_ini_state config_state;
-	struct transition_scheme *scheme;
+	struct settings settings;
 	GAMMA_STATE *method_state;
 	LOCATION_STATE *location_state;
-	int need_location;
-	size_t i;
-	struct location loc = { NAN, NAN };
-	double now, transition_prog;
+	struct location loc = {NAN, NAN};
+	double day_level;
 	enum period period;
 	struct colour_setting colour;
 
@@ -698,167 +472,32 @@ main(int argc, char *argv[])
 	textdomain(PACKAGE);
 #endif
 
-	options_init(&options);
-	options_parse_args(&options, argc, argv);
-
-	/* Load settings from config file. */
-	config_ini_init(&config_state, options.config_filepath);
-
-	free(options.config_filepath);
-
-	options_parse_config_file(&options, &config_state);
-
-	options_set_defaults(&options);
-
-	if (options.scheme.dawn.start >= 0 || options.scheme.dawn.end >= 0 ||
-	    options.scheme.dusk.start >= 0 || options.scheme.dusk.end >= 0) {
-		if (options.scheme.dawn.start < 0 || options.scheme.dawn.end < 0 ||
-		    options.scheme.dusk.start < 0 || options.scheme.dusk.end < 0)
-			eprintf(_("Partial time-configuration not supported!"));
-
-		if (options.scheme.dawn.start > options.scheme.dawn.end ||
-		    options.scheme.dawn.end > options.scheme.dusk.start ||
-		    options.scheme.dusk.start > options.scheme.dusk.end)
-			eprintf(_("Invalid dawn/dusk time configuration!"));
-
-		options.scheme.use_time = 1;
-	}
+	load_settings(&settings, argc, argv);
 
 	/* Initialize location provider if needed. If provider is NULL
 	   try all providers until one that works is found. */
 
 	/* Location is not needed for reset mode and manual mode. */
-	need_location = options.mode != PROGRAM_MODE_RESET &&
-	                options.mode != PROGRAM_MODE_MANUAL &&
-	                !options.scheme.use_time;
-	if (need_location) {
-		if (options.provider) {
-			/* Use provider specified on command line. */
-			if (provider_try_start(options.provider, &location_state, &config_state, options.provider_args) < 0)
-				exit(1);
-		} else {
-			/* Try all providers, use the first that works. */
-			for (i = 0; location_providers[i]; i++) {
-				const struct location_provider *p = location_providers[i];
-				weprintf(_("Trying location provider `%s'..."), p->name);
-				if (provider_try_start(p, &location_state, &config_state, NULL) < 0) {
-					weprintf(_("Trying next provider..."));
-					continue;
-				}
-
-				/* Found provider that works. */
-				printf(_("Using provider `%s'.\n"), p->name);
-				options.provider = p;
-				break;
-			}
-
-			/* Failure if no providers were successful at this point. */
-			if (!options.provider)
-				eprintf(_("No more location providers to try."));
-		}
-
-		/* Solar elevations */
-		if (options.scheme.high < options.scheme.low) {
-			eprintf(_("High transition elevation cannot be lower than the low transition elevation."));
-		}
-
-		if (options.verbose) {
-			/* TRANSLATORS: Append degree symbols if possible. */
-			printf(_("Solar elevations: day above %.1f, night below %.1f\n"),
-			       options.scheme.high, options.scheme.low);
-		}
-	}
-
-	if (options.mode != PROGRAM_MODE_RESET &&
-	    options.mode != PROGRAM_MODE_MANUAL) {
-		if (options.verbose) {
-			printf(_("Temperatures: %luK at day, %luK at night\n"),
-			       options.scheme.day.temperature, options.scheme.night.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 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);
-	}
-
-	/* Brightness */
-	if (!WITHIN(MIN_BRIGHTNESS, options.scheme.day.brightness, MAX_BRIGHTNESS) ||
-	    !WITHIN(MIN_BRIGHTNESS, options.scheme.night.brightness, MAX_BRIGHTNESS))
-		eprintf(_("Brightness values must be between %.1f and %.1f."), MIN_BRIGHTNESS, MAX_BRIGHTNESS);
-
-	if (options.verbose)
-		printf(_("Brightness: %.2f:%.2f\n"), options.scheme.day.brightness, options.scheme.night.brightness);
-
-	/* Gamma */
-	if (!gamma_is_valid(options.scheme.day.gamma) ||
-	    !gamma_is_valid(options.scheme.night.gamma))
-		eprintf(_("Gamma value must be between %.1f and %.1f."), MIN_GAMMA, MAX_GAMMA);
-
-	if (options.verbose) {
-		/* TRANSLATORS: The string in parenthesis is either
-		   Daytime or Night (translated). */
-		printf(_("Gamma (%s): %.3f, %.3f, %.3f\n"),
-		       _("Daytime"), options.scheme.day.gamma[0],
-		       options.scheme.day.gamma[1],
-		       options.scheme.day.gamma[2]);
-		printf(_("Gamma (%s): %.3f, %.3f, %.3f\n"),
-		       _("Night"), options.scheme.night.gamma[0],
-		       options.scheme.night.gamma[1],
-		       options.scheme.night.gamma[2]);
-	}
-
-	scheme = &options.scheme;
+	if (settings.scheme_type == SOLAR_SCHEME)
+		acquire_location_provider(&settings, &location_state);
 
 	/* Initialize gamma adjustment method. If method is NULL
 	   try all methods until one that works is found. */
 
 	/* Gamma adjustment not needed for print mode */
-	if (options.mode != PROGRAM_MODE_PRINT) {
-		if (options.method) {
-			/* Use method specified on command line. */
-			if (method_try_start(options.method, &method_state, options.mode, &config_state, options.method_args) < 0)
-				exit(1);
-		} else {
-			/* Try all methods, use the first that works. */
-			for (i = 0; gamma_methods[i]; i++) {
-				const struct gamma_method *m = gamma_methods[i];
-				if (!m->autostart)
-					continue;
+	if (settings.mode != PROGRAM_MODE_PRINT)
+		acquire_adjustment_method(&settings, &method_state);
 
-				if (method_try_start(m, &method_state, options.mode, &config_state, NULL) < 0) {
-					weprintf(_("Trying next method..."));
-					continue;
-				}
-
-				/* Found method that works. */
-				printf(_("Using method `%s'.\n"), m->name);
-				options.method = m;
-				break;
-			}
+	config_ini_free(&settings.config);
 
-			/* Failure if no methods were successful at this point. */
-			if (!options.method)
-				eprintf(_("No more methods to try."));
-		}
-	}
-
-	config_ini_free(&config_state);
-
-	switch (options.mode) {
+	switch (settings.mode) {
 	case PROGRAM_MODE_ONE_SHOT:
 	case PROGRAM_MODE_PRINT:
-		if (need_location) {
+		if (settings.scheme_type == SOLAR_SCHEME) {
 			weprintf(_("Waiting for current location to become available..."));
 
 			/* Wait for location provider. */
-			if (provider_get_location(options.provider, location_state, -1, &loc) < 0)
+			if (get_location(settings.provider, location_state, -1, &loc) < 0)
 				eprintf(_("Unable to get location from provider."));
 
 			if (!location_is_valid(&loc))
@@ -867,46 +506,26 @@ main(int argc, char *argv[])
 			print_location(&loc);
 		}
 
-		now = systemtime_get_time();
-
-		if (options.scheme.use_time) {
-			int time_offset = get_seconds_since_midnight(now);
-			period = get_period_from_time(scheme, time_offset);
-			transition_prog = get_transition_progress_from_time(scheme, time_offset);
-		} else {
-			/* Current angular elevation of the sun */
-			double elevation;
-			if (libred_solar_elevation(loc.latitude, loc.longitude, &elevation))
-				eprintf("libred_solar_elevation:");
-			if (options.verbose) {
-				/* TRANSLATORS: Append degree symbol if possible. */
-				printf(_("Solar elevation: %f\n"), elevation);
-			}
+		get_colour_settings(&loc, &colour, &period, &day_level, settings.verbose);
 
-			period = get_period_from_elevation(scheme, elevation);
-			transition_prog = get_transition_progress_from_elevation(scheme, elevation);
-		}
-
-		/* 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);
+		if (settings.verbose || settings.mode == PROGRAM_MODE_PRINT) {
+			if (settings.scheme_type != STATIC_SCHEME)
+				print_period(period, day_level);
 			printf(_("Color temperature: %luK\n"), colour.temperature);
 			printf(_("Brightness: %.2f\n"), colour.brightness);
 		}
 
-		if (options.mode == PROGRAM_MODE_PRINT)
+		if (settings.mode == PROGRAM_MODE_PRINT)
 			break;
 
 	apply:
-		if (options.method->set_temperature(method_state, &colour, options.preserve_gamma) < 0)
+		if (settings.method->set_temperature(method_state, &colour, settings.preserve_gamma.value) < 0)
 			eprintf(_("Temperature adjustment failed."));
 
 #ifndef WINDOWS
 		/* In Quartz (OSX) the gamma adjustments will automatically revert when
 		 * the process exits. Therefore, we have to loop until CTRL-C is received. */
-		if (!strcmp(options.method->name, "quartz")) {
+		if (!strcmp(settings.method->name, "quartz")) {
 			weprintf(_("Press ctrl-c to stop..."));
 			while (!exiting)
 				pause();
@@ -915,26 +534,26 @@ main(int argc, char *argv[])
 		break;
 
 	case PROGRAM_MODE_MANUAL:
-		if (options.verbose)
-			printf(_("Color temperature: %luK\n"), options.temp_set);
-		colour = scheme->day;
-		colour.temperature = options.temp_set;
+		/* TODO interpolate for current time if a value range has been specified */
+		colour = day_settings;
+		if (settings.verbose)
+			printf(_("Color temperature: %luK\n"), colour.temperature);
 		goto apply;
 
 	case PROGRAM_MODE_RESET:
 		colour = COLOUR_SETTING_NEUTRAL;
-		options.preserve_gamma = 0;
+		settings.preserve_gamma.value = 0;
 		goto apply;
 
 	case PROGRAM_MODE_CONTINUAL:
-		run_continual_mode(options.provider, location_state, scheme, options.method, method_state,
-		                   options.use_fade, options.preserve_gamma, options.verbose);
+		run_continual_mode(settings.provider, location_state, settings.method, method_state,
+		                   settings.use_fade.value, settings.preserve_gamma.value, settings.verbose);
 		break;
 	}
 
-	if (options.mode != PROGRAM_MODE_PRINT)
-		options.method->free(method_state);
-	if (need_location)
-		options.provider->free(location_state);
+	if (settings.mode != PROGRAM_MODE_PRINT)
+		settings.method->free(method_state);
+	if (scheme.type == SOLAR_SCHEME)
+		settings.provider->free(location_state);
 	return 0;
 }