Misc improvements

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

1 files changed, 88 insertions, 164 deletions

diff --git a/src/redshift.c b/src/redshift.c
index 70cdf38..ae92c86 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -1,28 +1,28 @@
 /* redshift.c -- Main program source
-   This file is part of redshift-ng.
-
-   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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   redshift-ng is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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@maandre.se>
-*/
+ * This file is part of redshift-ng.
+ * 
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * redshift-ng is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * 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@maandre.se>
+ */
 #include "common.h"
 #include "solar.h"
 
 /* poll.h is not available on Windows but there is no Windows location provider
-   using polling. On Windows, we just define some stubs to make things compile.
-   */
+ * using polling. On Windows, we just define some stubs to make things compile.
+ */
 #ifndef WINDOWS
 # include <poll.h>
 #else
@@ -36,13 +36,13 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; }
 #endif
 
 /* pause() is not defined on windows platform but is not needed either.
-   Use a noop macro instead. */
+ * Use a noop macro instead. */
 #ifdef WINDOWS
 # define pause()
 #endif
 
 #undef CLAMP
-#define CLAMP(lo,mid,up)  (((lo) > (mid)) ? (lo) : (((mid) < (up)) ? (mid) : (up)))
+#define CLAMP(LO, MID, UP)  (((LO) > (MID)) ? (LO) : (((MID) < (UP)) ? (MID) : (UP)))
 
 
 /* Bounds for parameters. */
@@ -191,9 +191,7 @@ interpolate_color_settings(const struct color_setting *first, const struct color
                            double alpha, struct color_setting *result)
 {
 	int i;
-
 	alpha = CLAMP(0.0, alpha, 1.0);
-
 	result->temperature = (1.0 - alpha) * first->temperature + alpha * second->temperature;
 	result->brightness  = (1.0 - alpha) * first->brightness  + alpha * second->brightness;
 	for (i = 0; i < 3; i++)
@@ -238,10 +236,12 @@ provider_try_start(const struct location_provider *provider, LOCATION_STATE **st
 	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.\n"), provider->name);
+		weprintf(_("Initialization of %s failed."), provider->name);
 		return -1;
 	}
 
@@ -250,9 +250,9 @@ provider_try_start(const struct location_provider *provider, LOCATION_STATE **st
 		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.\n"), provider->name);
+				weprintf(_("Failed to set %s option."), provider->name);
 				/* TRANSLATORS: `help' must not be translated. */
-				weprintf(_("Try `-l %s:help' for more information.\n"), provider->name);
+				weprintf(_("Try `-l %s:help' for more information."), provider->name);
 				return -1;
 			}
 		}
@@ -260,10 +260,6 @@ provider_try_start(const struct location_provider *provider, LOCATION_STATE **st
 
 	/* Set provider options from command line. */
 	for (i = 0; args; i++) {
-		char *next_arg;
-		const char *key;
-		char *value;
-
 		next_arg = strchr(args, ':');
 		if (next_arg)
 			*next_arg++ = '\0';
@@ -279,7 +275,7 @@ provider_try_start(const struct location_provider *provider, LOCATION_STATE **st
 				key = manual_keys[i];
 				value = args;
 			} else {
-				weprintf(_("Failed to parse option `%s'.\n"), args);
+				weprintf(_("Failed to parse option `%s'."), args);
 				return -1;
 			}
 		} else {
@@ -288,9 +284,9 @@ provider_try_start(const struct location_provider *provider, LOCATION_STATE **st
 
 		if (provider->set_option(*state, key, value) < 0) {
 			provider->free(*state);
-			weprintf(_("Failed to set %s option.\n"), provider->name);
+			weprintf(_("Failed to set %s option."), provider->name);
 			/* TRANSLATORS: `help' must not be translated. */
-			weprintf(_("Try `-l %s:help' for more information.\n"), provider->name);
+			weprintf(_("Try `-l %s:help' for more information."), provider->name);
 			return -1;
 		}
 
@@ -313,9 +309,11 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 {
 	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.\n"), method->name);
+		weprintf(_("Initialization of %s failed."), method->name);
 		return -1;
 	}
 
@@ -324,37 +322,33 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 		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.\n"), method->name);
+				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);
+				weprintf(_("Try `-m %s:help' for more information.\n"), method->name); /* TODO \n */
 				return -1;
 			}
 		}
 	}
 
 	/* Set method options from command line. */
-	while (args != NULL) {
-		char *next_arg;
-		const char *key;
-		char *value;
-
+	while (args) {
 		next_arg = strchr(args, ':');
-		if (next_arg != NULL)
+		if (next_arg)
 			*next_arg++ = '\0';
 
 		key = args;
 		value = strchr(args, '=');
 		if (!value) {
-			weprintf(_("Failed to parse option `%s'.\n"), args);
+			weprintf(_("Failed to parse option `%s'.\n"), args); /* TODO \n */
 			return -1;
 		}
 		*value++ = '\0';
 
 		if (method->set_option(*state, key, value) < 0) {
 			method->free(*state);
-			weprintf(_("Failed to set %s option.\n"), method->name);
+			weprintf(_("Failed to set %s option.\n"), method->name); /* TODO \n */
 			/* TRANSLATORS: `help' must not be translated. */
-			weprintf(_("Try -m %s:help' for more information.\n"), method->name);
+			weprintf(_("Try -m %s:help' for more information.\n"), method->name); /* TODO missing ` and \n */
 			return -1;
 		}
 
@@ -364,7 +358,7 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 	/* Start method. */
 	if (method->start(*state, mode) < 0) {
 		method->free(*state);
-		weprintf(_("Failed to start adjustment method %s.\n"), method->name);
+		weprintf(_("Failed to start adjustment method %s.\n"), method->name); /* TODO \n */
 		return -1;
 	}
 
@@ -390,14 +384,14 @@ location_is_valid(const struct location *location)
 	/* Latitude */
 	if (location->lat < MIN_LAT || location->lat > MAX_LAT) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT);
+		weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT); /* TODO \n */
 		return 0;
 	}
 
 	/* Longitude */
 	if (location->lon < MIN_LON || location->lon > MAX_LON) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON);
+		weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON); /* TODO \n */
 		return 0;
 	}
 
@@ -420,10 +414,7 @@ provider_get_location(const struct location_provider *provider, LOCATION_STATE *
 		if (loc_fd >= 0) {
 			/* Provider is dynamic. */
 			/* TODO: This should use a monotonic time source. */
-			if (systemtime_get_time(&now) < 0) {
-				weprintf(_("Unable to read system time.\n"));
-				return -1;
-			}
+			now = systemtime_get_time();
 
 			/* Poll on file descriptor until ready. */
 			pollfds[0].fd = loc_fd;
@@ -436,10 +427,7 @@ provider_get_location(const struct location_provider *provider, LOCATION_STATE *
 				return 0;
 			}
 
-			if (systemtime_get_time(&later) < 0) {
-				weprintf(_("Unable to read system time.\n"));
-				return -1;
-			}
+			later = systemtime_get_time();
 
 			/* Adjust timeout by elapsed time */
 			if (timeout >= 0) {
@@ -471,7 +459,7 @@ ease_fade(double t)
    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. */
-static int
+static void
 run_continual_mode(const struct location_provider *provider,
 		   LOCATION_STATE *location_state,
 		   const struct transition_scheme *scheme,
@@ -508,18 +496,14 @@ run_continual_mode(const struct location_provider *provider,
 	loc = (struct location){ NAN, NAN };
 	need_location = !scheme->use_time;
 	if (need_location) {
-		weprintf(_("Waiting for initial location to become available...\n"));
+		weprintf(_("Waiting for initial location to become available...\n")); /* TODO \n */
 
 		/* Get initial location from provider */
-		if (provider_get_location(provider, location_state, -1, &loc) < 0) {
-			weprintf(_("Unable to get location from provider.\n"));
-			return -1;
-		}
+		if (provider_get_location(provider, location_state, -1, &loc) < 0)
+			eprintf(_("Unable to get location from provider."));
 
-		if (!location_is_valid(&loc)) {
-			weprintf(_("Invalid location returned from provider.\n"));
-			return -1;
-		}
+		if (!location_is_valid(&loc))
+			eprintf(_("Invalid location returned from provider.\n")); /* TODO \n */
 
 		print_location(&loc);
 	}
@@ -545,13 +529,10 @@ run_continual_mode(const struct location_provider *provider,
 
 		/* Check to see if exit signal was caught */
 		if (exiting) {
-			if (done) {
-				/* On second signal stop the ongoing fade. */
-				break;
-			} else {
-				done = 1;
-				disabled = 1;
-			}
+			if (done)
+				break; /* On second signal stop the ongoing fade. */
+			done = 1;
+			disabled = 1;
 			exiting = 0;
 		}
 
@@ -562,10 +543,7 @@ run_continual_mode(const struct location_provider *provider,
 		prev_disabled = disabled;
 
 		/* Read timestamp */
-		if (systemtime_get_time(&now) < 0) {
-			weprintf(_("Unable to read system time.\n"));
-			return -1;
-		}
+		now = systemtime_get_time();
 
 		if (scheme->use_time) {
 			int time_offset = get_seconds_since_midnight(now);
@@ -629,7 +607,8 @@ run_continual_mode(const struct location_provider *provider,
 		}
 
 		/* Break loop when done and final fade is over */
-		if (done && fade_length == 0) break;
+		if (done && fade_length == 0)
+			break;
 
 		if (verbose) {
 			if (prev_target_interp.temperature != target_interp.temperature)
@@ -639,20 +618,15 @@ run_continual_mode(const struct location_provider *provider,
 		}
 
 		/* Adjust temperature */
-		if (method->set_temperature(method_state, &interp, preserve_gamma) < 0) {
-			weprintf(_("Temperature adjustment failed.\n"));
-			return -1;
-		}
+		if (method->set_temperature(method_state, &interp, preserve_gamma) < 0)
+			eprintf(_("Temperature adjustment failed."));
 
 		/* Save period and target color setting as previous */
 		prev_period = period;
 		prev_target_interp = target_interp;
 
 		/* Sleep length depends on whether a fade is ongoing. */
-		delay = SLEEP_DURATION;
-		if (fade_length != 0) {
-			delay = SLEEP_DURATION_SHORT;
-		}
+		delay = fade_length ? SLEEP_DURATION_SHORT : SLEEP_DURATION;
 
 		/* Update location. */
 		loc_fd = need_location ? provider->get_fd(location_state) : -1;
@@ -670,21 +644,18 @@ run_continual_mode(const struct location_provider *provider,
 				if (errno == EINTR)
 					continue;
 				weprintf("poll:");
-				weprintf(_("Unable to get location from provider.\n"));
-				return -1;
+				eprintf(_("Unable to get location from provider."));
 			} else if (r == 0) {
 				continue;
 			}
 
 			/* Get new location and availability
 			   information. */
-			if (provider->handle(location_state, &new_loc, &new_available) < 0) {
-				weprintf(_("Unable to get location from provider.\n"));
-				return -1;
-			}
+			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"
+				weprintf(_("Location is temporarily unavailable; Using previous" /* TODO captial U efter ; and \n*/
 				           " location until it becomes available...\n"));
 			}
 
@@ -698,10 +669,8 @@ run_continual_mode(const struct location_provider *provider,
 
 			location_available = new_available;
 
-			if (!location_is_valid(&loc)) {
-				weprintf(_("Invalid location returned from provider.\n"));
-				return -1;
-			}
+			if (!location_is_valid(&loc))
+				eprintf(_("Invalid location returned from provider."));
 		} else {
 			systemtime_msleep(delay);
 		}
@@ -709,8 +678,6 @@ run_continual_mode(const struct location_provider *provider,
 
 	/* Restore saved gamma ramps */
 	method->restore(method_state);
-
-	return 0;
 }
 
 
@@ -787,8 +754,7 @@ main(int argc, char *argv[])
 	options_parse_args(&options, argc, argv, gamma_methods, location_providers);
 
 	/* Load settings from config file. */
-	if (config_ini_init(&config_state, options.config_filepath) < 0)
-		eprintf(_("Unable to load config file."));
+	config_ini_init(&config_state, options.config_filepath);
 
 	free(options.config_filepath);
 
@@ -962,12 +928,7 @@ main(int argc, char *argv[])
 			print_location(&loc);
 		}
 
-		r = systemtime_get_time(&now);
-		if (r < 0) {
-			weprintf(_("Unable to read system time."));
-			options.method->free(method_state);
-			exit(1);
-		}
+		now = systemtime_get_time();
 
 		if (options.scheme.use_time) {
 			int time_offset = get_seconds_since_midnight(now);
@@ -994,82 +955,45 @@ main(int argc, char *argv[])
 			printf(_("Brightness: %.2f\n"), color.brightness);
 		}
 
-		if (options.mode != PROGRAM_MODE_PRINT) {
-			/* Adjust temperature */
-			if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0) {
-				weprintf(_("Temperature adjustment failed."));
-				options.method->free(method_state);
-				exit(EXIT_FAILURE);
-			}
-
-			/* In Quartz (macOS) 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")) {
-				weprintf(_("Press ctrl-c to stop..."));
-				pause();
-			}
-		}
-		break;
+		if (options.mode == PROGRAM_MODE_PRINT)
+			break;
 
-	case PROGRAM_MODE_MANUAL:
-		if (options.verbose)
-			printf(_("Color temperature: %uK\n"), options.temp_set);
-
-		/* Adjust temperature */
-		color = scheme->day;
-		color.temperature = options.temp_set;
-		r = options.method->set_temperature(method_state, &color, options.preserve_gamma);
-		if (r < 0) {
+	apply:
+		if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0) {
 			weprintf(_("Temperature adjustment failed."));
 			options.method->free(method_state);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 
-		/* In Quartz (OSX) the gamma adjustments will automatically
-		   revert when the process exits. Therefore, we have to loop
-		   until CTRL-C is received. */
+		/* 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")) {
 			weprintf(_("Press ctrl-c to stop..."));
 			pause();
 		}
 		break;
 
+	case PROGRAM_MODE_MANUAL:
+		if (options.verbose)
+			printf(_("Color temperature: %uK\n"), options.temp_set);
+		color = scheme->day;
+		color.temperature = options.temp_set;
+		goto apply;
+
 	case PROGRAM_MODE_RESET:
-		/* Reset screen */
 		color_setting_reset(&color);
-
-		if (options.method->set_temperature(method_state, &color, 0) < 0) {
-			weprintf(_("Temperature adjustment failed."));
-			options.method->free(method_state);
-			exit(EXIT_FAILURE);
-		}
-
-		/* 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")) {
-			weprintf(_("Press ctrl-c to stop..."));
-			pause();
-		}
-		break;
+		options.preserve_gamma = 0;
+		goto apply;
 
 	case PROGRAM_MODE_CONTINUAL:
-		r = run_continual_mode(options.provider, location_state, scheme, options.method, method_state,
-		                       options.use_fade, options.preserve_gamma, options.verbose);
-		if (r < 0)
-			exit(EXIT_FAILURE);
+		run_continual_mode(options.provider, location_state, scheme, options.method, method_state,
+		                   options.use_fade, options.preserve_gamma, options.verbose);
 		break;
 	}
 
-	/* Clean up gamma adjustment state */
 	if (options.mode != PROGRAM_MODE_PRINT)
 		options.method->free(method_state);
-
-	/* Clean up location provider state */
 	if (need_location)
 		options.provider->free(location_state);
-
-	return EXIT_SUCCESS;
+	return 0;
 }