minor misc improvements

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

3 files changed, 157 insertions, 119 deletions

diff --git a/src/common.h b/src/common.h
index 0b89b8f..22253e7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <limits.h>
 #include <locale.h>
 #include <math.h>
 #include <signal.h>
@@ -117,16 +118,84 @@
 
 
 /**
+ * Minimum valid latitude
+ */
+#define MIN_LATITUDE -90.0
+
+/**
+ * Maximum valid latitude
+ */
+#define MAX_LATITUDE 90.0
+
+/**
+ * Minimum valid longitude
+ */
+#define MIN_LONGITUDE -180.0
+
+/**
+ * Maximum valid longitude
+ */
+#define MAX_LONGITUDE 180.0
+
+/**
+ * Minimum allowed colour temperature
+ */
+#define MIN_TEMPERATURE ((unsigned long int)LIBRED_LOWEST_TEMPERATURE)
+
+/**
+ * Maximum allowed colour temperature
+ */
+#define MAX_TEMPERATURE ULONG_MAX
+
+/**
+ * Minimum allowed whitepoint brightness
+ */
+#define MIN_BRIGHTNESS 0.1
+
+/**
+ * Maximum allowed whitepoint brightness
+ */
+#define MAX_BRIGHTNESS 1.0
+
+/**
+ * Minimum allowed gamma
+ */
+#define MIN_GAMMA 0.1
+
+/**
+ * Maximum allowed gamma
+ */
+#define MAX_GAMMA 10.0
+
+
+/**
  * The colour temperature corresponding to no effect
  */
-#define NEUTRAL_TEMP  6500U
+#define NEUTRAL_TEMPERATURE  6500UL
+
+/**
+ * The whitepoint brightness corresponding to
+ * full brightness (no effect)
+ */
+#define NEUTRAL_BRIGHTNESS  1.0
+
+/**
+ * The gamma corresponding to no effect (linear output level curve)
+ */
+#define NEUTRAL_GAMMA  1.0
+
 
 /**
  * Initialiser for `struct color_setting`
  * 
  * Sets all values to their neutral values (no effects applied)
  */
-#define COLOR_SETTING_NEUTRAL  ((struct color_setting){NEUTRAL_TEMP, 1.0, {1.0, 1.0, 1.0}})
+#define COLOR_SETTING_NEUTRAL\
+	((struct color_setting){\
+		NEUTRAL_TEMPERATURE,\
+		NEUTRAL_BRIGHTNESS,\
+		{NEUTRAL_GAMMA, NEUTRAL_GAMMA, NEUTRAL_GAMMA}\
+	})
 
 
 /**
diff --git a/src/options.c b/src/options.c
index 7a7fb01..8c9c766 100644
--- a/src/options.c
+++ b/src/options.c
@@ -27,10 +27,15 @@
 #define TRANSITION_HIGH    3.0
 
 /* Default values for parameters. */
-#define DEFAULT_DAY_TEMP    6500UL
-#define DEFAULT_NIGHT_TEMP  4500UL
-#define DEFAULT_BRIGHTNESS   1.0
-#define DEFAULT_GAMMA        1.0
+#define DEFAULT_DAY_TEMPERATURE    6500UL
+#define DEFAULT_NIGHT_TEMPERATURE  4500UL
+#define DEFAULT_BRIGHTNESS   NEUTRAL_BRIGHTNESS
+#define DEFAULT_GAMMA        NEUTRAL_GAMMA
+
+
+/* TODO missing translation */
+USAGE("[-b day:night] [-c file] [-g r:g:b] [-l latitude:longitude | -l provider[:options]]"
+      " [-m method[:options]] [-o | -O temperature | -t day:night | -x] [-pPrv] | -hV");
 
 
 /* A brightness string contains either one floating point value,
@@ -104,19 +109,17 @@ parse_transition_time(const char *str, const char **end)
 static int
 parse_transition_range(const char *str, struct time_range *range)
 {
-	const char *next = NULL;
-	int start_time;
-	int end_time;
+	const char *next = NULL, *end = NULL;
+	int start_time, end_time;
 
 	start_time = parse_transition_time(str, &next);
-	if (start_time < 0) return -1;
+	if (start_time < 0)
+		return -1;
 
-	if (next[0] == '\0') {
+	if (!*next) {
 		end_time = start_time;
-	} else if (next[0] == '-') {
-		const char *end = NULL;
-		next += 1;
-		end_time = parse_transition_time(next, &end);
+	} else if (*next == '-') {
+		end_time = parse_transition_time(&next[1], &end);
 		if (end_time < 0 || *end)
 			return -1;
 	} else {
@@ -139,61 +142,56 @@ print_help(void)
 	   NIGHT is temperature at night
 	   no-wrap */
 	printf(_("Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"), argv0);
-	fputs("\n", stdout);
+	printf("\n");
 
 	/* TRANSLATORS: help output 2
 	   no-wrap */
-	fputs(_("Set color temperature of display"
-		" according to time of day.\n"), stdout);
-	fputs("\n", stdout);
+	printf(_("Set color temperature of display according to time of day.\n"));
+	printf("\n");
 
 	/* TRANSLATORS: help output 3
 	   no-wrap */
-	fputs(_("  -h\t\tDisplay this help message\n"
-		"  -v\t\tVerbose output\n"
-		"  -V\t\tShow program version\n"), stdout);
-	fputs("\n", stdout);
+	printf(_("  -h\t\tDisplay this help message\n"
+	         "  -v\t\tVerbose output\n"
+	         "  -V\t\tShow program version\n"));
+	printf("\n");
 
 	/* TRANSLATORS: help output 4
 	   `list' must not be translated
 	   no-wrap */
-	fputs(_("  -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n"
-		"  -c FILE\tLoad settings from specified configuration file\n"
-		"  -g R:G:B\tAdditional gamma correction to apply\n"
-		"  -l LAT:LON\tYour current location\n"
-		"  -l PROVIDER\tSelect provider for automatic"
-		" location updates\n"
-		"  \t\t(Type `list' to see available providers)\n"
-		"  -m METHOD\tMethod to use to set color temperature\n"
-		"  \t\t(Type `list' to see available methods)\n"
-		"  -o\t\tOne shot mode (do not continuously adjust"
-		" color temperature)\n"
-		"  -O TEMP\tOne shot manual mode (set color temperature)\n"
-		"  -p\t\tPrint mode (only print parameters and exit)\n"
-		"  -P\t\tReset existing gamma ramps before applying new"
-		" color effect\n"
-		"  -x\t\tReset mode (remove adjustment from screen)\n"
-		"  -r\t\tDisable fading between color temperatures\n"
-		"  -t DAY:NIGHT\tColor temperature to set at daytime/night\n"),
-	      stdout);
-	fputs("\n", stdout);
+	printf(_("  -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n"
+	         "  -c FILE\tLoad settings from specified configuration file\n"
+	         "  -g R:G:B\tAdditional gamma correction to apply\n"
+	         "  -l LAT:LON\tYour current location\n"
+	         "  -l PROVIDER\tSelect provider for automatic location updates\n"
+	         "  \t\t(Type `list' to see available providers)\n"
+	         "  -m METHOD\tMethod to use to set color temperature\n"
+	         "  \t\t(Type `list' to see available methods)\n"
+	         "  -o\t\tOne shot mode (do not continuously adjust color temperature)\n"
+	         "  -O TEMP\tOne shot manual mode (set color temperature)\n"
+	         "  -p\t\tPrint mode (only print parameters and exit)\n"
+	         "  -P\t\tReset existing gamma ramps before applying new color effect\n"
+	         "  -x\t\tReset mode (remove adjustment from screen)\n"
+	         "  -r\t\tDisable fading between color temperatures\n"
+	         "  -t DAY:NIGHT\tColor temperature to set at daytime/night\n"));
+	printf("\n");
 
 	/* TRANSLATORS: help output 5 */
-	printf(_("The neutral temperature is %uK. Using this value will not change "
-		 "the color\ntemperature of the display. Setting the color temperature "
-		 "to a value higher\nthan this results in more blue light, and setting "
-		 "a lower value will result in\nmore red light.\n"),
-		 NEUTRAL_TEMP);
+	printf(_("The neutral temperature is %luK. Using this value will not change the color\n"
+	         "temperature of the display. Setting the color temperature to a value higher\n"
+	         "than this results in more blue light, and setting a lower value will result in\n"
+	         "more red light.\n"),
+	       NEUTRAL_TEMPERATURE);
 
-	fputs("\n", stdout);
+	printf("\n");
 
 	/* TRANSLATORS: help output 6 */
 	printf(_("Default values:\n\n"
 		 "  Daytime temperature: %luK\n"
 		 "  Night temperature: %luK\n"),
-	       DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP);
+	       DEFAULT_DAY_TEMPERATURE, DEFAULT_NIGHT_TEMPERATURE);
 
-	fputs("\n", stdout);
+	printf("\n");
 }
 
 /* Print list of adjustment methods. */
@@ -201,7 +199,6 @@ static void
 print_method_list(void)
 {
 	size_t i;
-
 	fputs(_("Available adjustment methods:\n"), stdout);
 	for (i = 0; gamma_methods[i]; i++)
 		printf("  %s\n", gamma_methods[i]->name);
@@ -217,11 +214,9 @@ static void
 print_provider_list(void)
 {
 	size_t i;
-
 	fputs(_("Available location providers:\n"), stdout);
-	for (i = 0; location_providers[i]; i++) {
+	for (i = 0; location_providers[i]; i++)
 		printf("  %s\n", location_providers[i]->name);
-	}
 
 	fputs("\n", stdout);
 	fputs(_("Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"), stdout);
@@ -230,7 +225,7 @@ print_provider_list(void)
 }
 
 /* Return the gamma method with the given name. */
-GCC_ONLY(__attribute__((__pure__)))
+GCC_ONLY(__attribute__((__pure__, __returns_nonnull__)))
 static const struct gamma_method *
 find_gamma_method(const char *name)
 {
@@ -238,23 +233,22 @@ find_gamma_method(const char *name)
 	for (i = 0; gamma_methods[i]; i++)
 		if (!strcasecmp(name, gamma_methods[i]->name))
 			return gamma_methods[i];
-	return NULL;
+	/* TRANSLATORS: This refers to the method used to adjust colors e.g. VidMode */
+	eprintf(_("Unknown adjustment method `%s'."), name);
 }
 
 /* Return location provider with the given name. */
-GCC_ONLY(__attribute__((__pure__)))
+GCC_ONLY(__attribute__((__pure__, __returns_nonnull__)))
 static const struct location_provider *
 find_location_provider(const char *name)
 {
 	size_t i;
-	for (i = 0; location_providers[i]; i++) {
+	for (i = 0; location_providers[i]; i++)
 		if (!strcasecmp(name, location_providers[i]->name))
 			return location_providers[i];
-	}
-	return NULL;
+	eprintf(_("Unknown location provider `%s'."), name);
 }
 
-
 /* Initialize options struct. */
 void
 options_init(struct options *options)
@@ -296,26 +290,26 @@ options_init(struct options *options)
 	options->verbose = 0;
 }
 
-/* Parse a single option from the command-line. */
-static void
-parse_command_line_option(const char option, char *value, struct options *options)
+/* Parse command line arguments. */
+void
+options_parse_args(struct options *options, int argc, char *argv[])
 {
 	const char *provider_name;
-	char *s, *end;
+	char *s, *end, *value;
 	int r;
 
-	switch (option) {
+	ARGBEGIN {
 	case 'b':
-		parse_brightness_string(value, &options->scheme.day.brightness, &options->scheme.night.brightness);
+		parse_brightness_string(ARG(), &options->scheme.day.brightness, &options->scheme.night.brightness);
 		break;
 
 	case 'c':
 		free(options->config_filepath);
-		options->config_filepath = estrdup(value);
+		options->config_filepath = estrdup(ARG());
 		break;
 
 	case 'g':
-		r = parse_gamma_string(value, options->scheme.day.gamma);
+		r = parse_gamma_string(ARG(), options->scheme.day.gamma);
 		if (r < 0) {
 			weprintf(_("Malformed gamma argument."));
 			eprintf(_("Try `-h' for more information."));
@@ -330,6 +324,8 @@ parse_command_line_option(const char option, char *value, struct options *option
 		exit(0);
 
 	case 'l':
+		value = ARG();
+
 		/* Print list of providers if argument is `list' */
 		if (!strcasecmp(value, "list")) {
 			print_provider_list();
@@ -359,8 +355,6 @@ parse_command_line_option(const char option, char *value, struct options *option
 
 		/* Lookup provider from name. */
 		options->provider = find_location_provider(provider_name);
-		if (!options->provider)
-			eprintf(_("Unknown location provider `%s'."), provider_name);
 
 		/* Print provider help if arg is `help'. */
 		if (options->provider_args && !strcasecmp(options->provider_args, "help")) {
@@ -370,6 +364,8 @@ parse_command_line_option(const char option, char *value, struct options *option
 		break;
 
 	case 'm':
+		value = ARG();
+
 		/* Print list of methods if argument is `list' */
 		if (!strcasecmp(value, "list")) {
 			print_method_list();
@@ -385,10 +381,6 @@ parse_command_line_option(const char option, char *value, struct options *option
 
 		/* Find adjustment method by name. */
 		options->method = find_gamma_method(value);
-		if (!options->method) {
-			/* TRANSLATORS: This refers to the method used to adjust colors e.g. VidMode */
-			eprintf(_("Unknown adjustment method `%s'."), value);
-		}
 
 		/* Print method help if arg is `help'. */
 		if (options->method_args && !strcasecmp(options->method_args, "help")) {
@@ -403,7 +395,7 @@ parse_command_line_option(const char option, char *value, struct options *option
 
 	case 'O':
 		options->mode = PROGRAM_MODE_MANUAL;
-		options->temp_set = atoi(value);
+		options->temp_set = atoi(ARG());
 		break;
 
 	case 'p':
@@ -419,6 +411,7 @@ parse_command_line_option(const char option, char *value, struct options *option
 		break;
 
 	case 't':
+		value = ARG();
 		s = strchr(value, ':');
 		if (!s) {
 			weprintf(_("Malformed temperature argument."));
@@ -443,17 +436,11 @@ parse_command_line_option(const char option, char *value, struct options *option
 		break;
 
 	default:
-		eprintf(_("Try `-h' for more information."));
-	}
-}
+		usage();
+	} ARGEND;
 
-/* Parse command line arguments. */
-void
-options_parse_args(struct options *options, int argc, char *argv[])
-{
-	int opt;
-	while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:pPrt:vVx")) != -1)
-		parse_command_line_option(opt, optarg, options);
+	if (argc)
+		usage();
 }
 
 /* Parse a single key-value pair from the configuration file. */
@@ -505,17 +492,11 @@ parse_config_file_option(const char *key, const char *value, struct options *opt
 		if (options->preserve_gamma == 1)
 			options->preserve_gamma = !!atoi(value);
 	} else if (!strcasecmp(key, "adjustment-method")) {
-		if (!options->method) {
+		if (!options->method)
 			options->method = find_gamma_method(value);
-			if (!options->method)
-				eprintf(_("Unknown adjustment method `%s'."), value);
-		}
 	} else if (!strcasecmp(key, "location-provider")) {
-		if (!options->provider) {
+		if (!options->provider)
 			options->provider = find_location_provider(value);
-			if (!options->provider)
-				eprintf(_("Unknown location provider `%s'."), value);
-		}
 	} else if (!strcasecmp(key, "dawn-time")) {
 		if (options->scheme.dawn.start < 0) {
 			if (parse_transition_range(value, &options->scheme.dawn) < 0)
@@ -552,9 +533,9 @@ void
 options_set_defaults(struct options *options)
 {
 	if (!options->scheme.day.temperature)
-		options->scheme.day.temperature = DEFAULT_DAY_TEMP;
+		options->scheme.day.temperature = DEFAULT_DAY_TEMPERATURE;
 	if (!options->scheme.night.temperature)
-		options->scheme.night.temperature = DEFAULT_NIGHT_TEMP;
+		options->scheme.night.temperature = DEFAULT_NIGHT_TEMPERATURE;
 
 	if (isnan(options->scheme.day.brightness))
 		options->scheme.day.brightness = DEFAULT_BRIGHTNESS;
diff --git a/src/redshift.c b/src/redshift.c
index 451c4bf..7170a03 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -31,22 +31,10 @@ struct pollfd {
 	short events;
 	short revents;
 };
-int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; }
+int poll(struct pollfd *fds, int nfds, int timeout) { abort(); }
 #endif
 
 
-/* Bounds for parameters. */
-#define MIN_LAT   -90.0
-#define MAX_LAT    90.0
-#define MIN_LON  -180.0
-#define MAX_LON   180.0
-#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
-#define MAX_GAMMA  10.0
-
 /* Duration of sleep between screen updates (milliseconds). */
 #define SLEEP_DURATION        5000
 #define SLEEP_DURATION_SHORT  100
@@ -391,14 +379,14 @@ gamma_is_valid(const double gamma[3])
 static int
 location_is_valid(const struct location *location)
 {
-	if (!WITHIN(MIN_LAT, location->lat, MAX_LAT)) {
+	if (!WITHIN(MIN_LATITUDE, location->lat, MAX_LATITUDE)) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT); /* TODO \n */
+		weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LATITUDE, MAX_LATITUDE); /* TODO \n */
 		return 0;
 	}
-	if (!WITHIN(MIN_LON, location->lon, MAX_LON)) {
+	if (!WITHIN(MIN_LONGITUDE, location->lon, MAX_LONGITUDE)) {
 		/* TRANSLATORS: Append degree symbols if possible. */
-		weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON); /* TODO \n */
+		weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LONGITUDE, MAX_LONGITUDE); /* TODO \n */
 		return 0;
 	}
 	return 1;
@@ -789,15 +777,15 @@ main(int argc, char *argv[])
 		}
 
 		/* Color temperature */
-		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 (!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 */
-		if (!WITHIN(MIN_TEMP, options.temp_set, MAX_TEMP))
-			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP);
+		if (!WITHIN(MIN_TEMPERATURE, options.temp_set, MAX_TEMPERATURE))
+			eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMPERATURE, MAX_TEMPERATURE);
 	}
 
 	/* Brightness */