misc

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

1 files changed, 31 insertions, 58 deletions

diff --git a/src/redshift.c b/src/redshift.c
index 836a848..451c4bf 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -15,7 +15,7 @@
  * 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>
+ * Copyright (c) 2025       Mattias Andrée <m@maandree.se>
  */
 #include "common.h"
 
@@ -40,8 +40,8 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; }
 #define MAX_LAT    90.0
 #define MIN_LON  -180.0
 #define MAX_LON   180.0
-#define MIN_TEMP   1000
-#define MAX_TEMP  25000
+#define MIN_TEMP   1000UL
+#define MAX_TEMP  25000UL /* TODO README documents that there is no limit */
 #define MIN_BRIGHTNESS  0.1
 #define MAX_BRIGHTNESS  1.0
 #define MIN_GAMMA   0.1
@@ -179,16 +179,10 @@ get_seconds_since_midnight(double timestamp)
 static void
 print_period(enum period period, double transition)
 {
-	switch (period) {
-	case PERIOD_NONE:
-	case PERIOD_NIGHT:
-	case PERIOD_DAYTIME:
-		printf(_("Period: %s\n"), gettext(period_names[period]));
-		break;
-	case PERIOD_TRANSITION:
+	if (period == PERIOD_TRANSITION)
 		printf(_("Period: %s (%.2f%% day)\n"), gettext(period_names[period]), transition * 100);
-		break;
-	}
+	else
+		printf(_("Period: %s\n"), gettext(period_names[period]));
 }
 
 /* Print location */
@@ -237,24 +231,13 @@ interpolate_transition_scheme(const struct transition_scheme *transition, double
 static int
 color_setting_diff_is_major(const struct color_setting *first, const struct color_setting *second)
 {
-	return abs(first->temperature - second->temperature) > 25 ||
+	return MAX(first->temperature, second->temperature) - MIN(first->temperature, second->temperature) > 25UL ||
 	       fabs(first->brightness - second->brightness) > 0.1 ||
 	       fabs(first->gamma[0] - second->gamma[0]) > 0.1 ||
 	       fabs(first->gamma[1] - second->gamma[1]) > 0.1 ||
 	       fabs(first->gamma[2] - second->gamma[2]) > 0.1;
 }
 
-/* Reset color setting to default values. */
-static void
-color_setting_reset(struct color_setting *color)
-{
-	color->temperature = NEUTRAL_TEMP;
-	color->gamma[0] = 1.0;
-	color->gamma[1] = 1.0;
-	color->gamma[2] = 1.0;
-	color->brightness = 1.0;
-}
-
 
 static int
 provider_try_start(const struct location_provider *provider, LOCATION_STATE **state,
@@ -397,9 +380,9 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 static int
 gamma_is_valid(const double gamma[3])
 {
-	return !(gamma[0] < MIN_GAMMA || gamma[0] > MAX_GAMMA ||
-		 gamma[1] < MIN_GAMMA || gamma[1] > MAX_GAMMA ||
-		 gamma[2] < MIN_GAMMA || gamma[2] > MAX_GAMMA);
+	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.
@@ -408,20 +391,16 @@ gamma_is_valid(const double gamma[3])
 static int
 location_is_valid(const struct location *location)
 {
-	/* Latitude */
-	if (location->lat < MIN_LAT || location->lat > MAX_LAT) {
+	if (!WITHIN(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); /* TODO \n */
 		return 0;
 	}
-
-	/* Longitude */
-	if (location->lon < MIN_LON || location->lon > MAX_LON) {
+	if (!WITHIN(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); /* TODO \n */
 		return 0;
 	}
-
 	return 1;
 }
 
@@ -513,11 +492,11 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 	/* Previous target color setting and current actual color setting.
 	   Actual color setting takes into account the current color fade. */
-	color_setting_reset(&prev_target_interp);
+	prev_target_interp = COLOR_SETTING_NEUTRAL;
 
-	color_setting_reset(&interp);
+	interp = COLOR_SETTING_NEUTRAL;
 
-	loc = (struct location){ NAN, NAN };
+	loc = (struct location){NAN, NAN};
 	need_location = !scheme->use_time;
 	if (need_location) {
 		weprintf(_("Waiting for initial location to become available...\n")); /* TODO \n */
@@ -533,7 +512,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 	}
 
 	if (verbose) {
-		printf(_("Color temperature: %uK\n"), interp.temperature);
+		printf(_("Color temperature: %luK\n"), interp.temperature);
 		printf(_("Brightness: %.2f\n"), interp.brightness);
 	}
 
@@ -589,7 +568,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 		if (disabled) {
 			period = PERIOD_NONE;
-			color_setting_reset(&target_interp);
+			target_interp = COLOR_SETTING_NEUTRAL;
 		}
 
 		if (done)
@@ -638,7 +617,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc
 
 		if (verbose) {
 			if (prev_target_interp.temperature != target_interp.temperature)
-				printf(_("Color temperature: %uK\n"), target_interp.temperature);
+				printf(_("Color temperature: %luK\n"), target_interp.temperature);
 			if (!exact_eq(prev_target_interp.brightness, target_interp.brightness))
 				printf(_("Brightness: %.2f\n"), target_interp.brightness);
 		}
@@ -715,7 +694,7 @@ main(int argc, char *argv[])
 	struct transition_scheme *scheme;
 	GAMMA_STATE *method_state;
 	LOCATION_STATE *location_state;
-	int r, need_location;
+	int need_location;
 	size_t i;
 	struct location loc = { NAN, NAN };
 	double now, transition_prog;
@@ -805,29 +784,25 @@ main(int argc, char *argv[])
 	if (options.mode != PROGRAM_MODE_RESET &&
 	    options.mode != PROGRAM_MODE_MANUAL) {
 		if (options.verbose) {
-			printf(_("Temperatures: %iK at day, %iK at night\n"),
+			printf(_("Temperatures: %luK at day, %luK at night\n"),
 			       options.scheme.day.temperature, options.scheme.night.temperature);
 		}
 
 		/* Color temperature */
-		if (options.scheme.day.temperature < MIN_TEMP ||
-		    options.scheme.day.temperature > MAX_TEMP ||
-		    options.scheme.night.temperature < MIN_TEMP ||
-		    options.scheme.night.temperature > MAX_TEMP)
-			eprintf(_("Temperature must be between %uK and %uK."), MIN_TEMP, MAX_TEMP);
+		if (!WITHIN(MIN_TEMP, options.scheme.day.temperature, MAX_TEMP) ||
+		    !WITHIN(MIN_TEMP, options.scheme.night.temperature, MAX_TEMP))
+			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP);
 	}
 
 	if (options.mode == PROGRAM_MODE_MANUAL) {
 		/* Check color temperature to be set */
-		if (options.temp_set < MIN_TEMP || options.temp_set > MAX_TEMP)
-			eprintf(_("Temperature must be between %uK and %uK."), MIN_TEMP, MAX_TEMP);
+		if (!WITHIN(MIN_TEMP, options.temp_set, MAX_TEMP))
+			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP);
 	}
 
 	/* Brightness */
-	if (options.scheme.day.brightness < MIN_BRIGHTNESS ||
-	    options.scheme.day.brightness > MAX_BRIGHTNESS ||
-	    options.scheme.night.brightness < MIN_BRIGHTNESS ||
-	    options.scheme.night.brightness > MAX_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)
@@ -860,9 +835,7 @@ main(int argc, char *argv[])
 	if (options.mode != PROGRAM_MODE_PRINT) {
 		if (options.method) {
 			/* Use method specified on command line. */
-			r = method_try_start(options.method, &method_state, options.mode,
-			                     &config_state, options.method_args);
-			if (r < 0)
+			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. */
@@ -931,7 +904,7 @@ main(int argc, char *argv[])
 
 		if (options.verbose || options.mode == PROGRAM_MODE_PRINT) {
 			print_period(period, transition_prog);
-			printf(_("Color temperature: %uK\n"), color.temperature);
+			printf(_("Color temperature: %luK\n"), color.temperature);
 			printf(_("Brightness: %.2f\n"), color.brightness);
 		}
 
@@ -955,13 +928,13 @@ main(int argc, char *argv[])
 
 	case PROGRAM_MODE_MANUAL:
 		if (options.verbose)
-			printf(_("Color temperature: %uK\n"), options.temp_set);
+			printf(_("Color temperature: %luK\n"), options.temp_set);
 		color = scheme->day;
 		color.temperature = options.temp_set;
 		goto apply;
 
 	case PROGRAM_MODE_RESET:
-		color_setting_reset(&color);
+		color = COLOR_SETTING_NEUTRAL;
 		options.preserve_gamma = 0;
 		goto apply;