From 6a6b10be7642e59ae40f9911282a8e2aa2601d82 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 8 Mar 2025 13:27:09 +0100 Subject: misc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/common.h | 103 +++++++++++++++++++++++++++++++++++++++++--------- src/config-ini.c | 8 ++-- src/gamma-dummy.c | 2 +- src/gamma-quartz.c | 2 +- src/gamma-randr.c | 2 +- src/gamma-vidmode.c | 2 +- src/location-manual.c | 1 + src/options.c | 28 +++++++------- src/redshift.c | 89 +++++++++++++++---------------------------- 9 files changed, 141 insertions(+), 96 deletions(-) (limited to 'src') diff --git a/src/common.h b/src/common.h index ca9e439..4ac8b53 100644 --- a/src/common.h +++ b/src/common.h @@ -81,6 +81,11 @@ #define N_(s) s +#if defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wunsuffixed-float-constants" +#endif + + #if defined(__GNUC__) # define GCC_ONLY(...) __VA_ARGS__ #else @@ -89,13 +94,7 @@ /** - * The colour temperature corresponding to no effect - */ -#define NEUTRAL_TEMP 6500 - - -/** - * Truncate a value into a bounded range + * Truncate a value into a closed range * * @param LO The lower bound * @param X The value to truncated @@ -104,6 +103,43 @@ */ #define CLAMP(LO, X, UP) (((LO) > (X)) ? (LO) : (((X) < (UP)) ? (X) : (UP))) +/** + * Check whether a value is within a closed range + * + * @param LO The lower bound + * @param X The value to check + * @param UP The upper bound + * @return :int 1 if `X` is within [`LO`, `UP`], 0 otherwise + */ +#define WITHIN(LO, X, UP) ((LO) <= (X) && (X) <= (UP)) + + +/** + * The colour temperature corresponding to no effect + */ +#define NEUTRAL_TEMP 6500U + +/** + * 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}}) + + +/** + * State of an adjustment method + * + * Each method has their own definition of this structure + */ +typedef struct gamma_state GAMMA_STATE; + +/** + * State of a location provider + * + * Each provider has their own definition of this structure + */ +typedef struct location_state LOCATION_STATE; enum period { @@ -121,16 +157,45 @@ enum program_mode { PROGRAM_MODE_MANUAL }; + +/** + * Geographical location, using GPS coordinates + */ struct location { - double lat, lon; + /** + * Degrees north of the equator + */ + double lat; + + /** + * Degrees east of the prime meridian + */ + double lon; }; + +/** + * Colour setting to apply + */ struct color_setting { - int temperature; - double gamma[3]; + /** + * Colour temperature, in Kelvin + */ + unsigned long int temperature; + + /** + * Whitepoint brightness level + */ double brightness; + + /** + * Gamma correct, for the each RGB channel + * in the order: red, green, and blue + */ + double gamma[3]; }; + /* Time range. Fields are offsets from midnight in seconds. */ struct time_range { @@ -138,6 +203,7 @@ struct time_range { int end; }; + /* Transition scheme. The solar elevations at which the transition begins/ends, and the association color settings. */ @@ -151,18 +217,21 @@ struct transition_scheme { struct color_setting night; }; + struct config_ini_setting { struct config_ini_setting *next; char *name; char *value; }; + struct config_ini_section { struct config_ini_section *next; char *name; struct config_ini_setting *settings; }; + struct config_ini_state { struct config_ini_section *sections; }; @@ -177,7 +246,7 @@ struct options { int verbose; /* Temperature to set in manual mode. */ - int temp_set; + unsigned long int temp_set; /* Whether to fade between large skips in color temperature. */ int use_fade; /* Whether to preserve gamma ramps if supported by gamma method. */ @@ -195,9 +264,9 @@ struct options { }; -/* Gamma adjustment method */ -typedef struct gamma_state GAMMA_STATE; - +/** + * Adjustment method information and interface + */ struct gamma_method { const char *name; @@ -223,9 +292,9 @@ struct gamma_method { }; -/* Location provider */ -typedef struct location_state LOCATION_STATE; - +/** + * Location provider information and interface + */ struct location_provider { const char *name; diff --git a/src/config-ini.c b/src/config-ini.c index db94f22..c524605 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -193,19 +193,19 @@ try_path(const struct env_path *path_spec, char **path_out) stpcpy(&path[len], path_spec->suffix); f = fopen(path, "r"); if (f) { - weprintf(_("Found configuration file `%s'.")); + weprintf(_("Found configuration file `%s'."), path); break; } else if (errno != ENOENT) { - eprintf("fopen %s \"%s\":", path); + eprintf("fopen %s \"r\":", path); } } } else { stpcpy(stpcpy(path, prefix), path_spec->suffix); f = fopen(path, "r"); if (f) - weprintf(_("Found configuration file `%s'.")); + weprintf(_("Found configuration file `%s'."), path); else if (errno != ENOENT) - eprintf("fopen %s \"%s\":", path); + eprintf("fopen %s \"r\":", path); } if (f) { diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c index cc494e4..9f3e907 100644 --- a/src/gamma-dummy.c +++ b/src/gamma-dummy.c @@ -69,7 +69,7 @@ gamma_dummy_set_temperature( { (void) state; (void) preserve; - printf(_("Temperature: %i\n"), setting->temperature); + printf(_("Temperature: %lu\n"), setting->temperature); return 0; } diff --git a/src/gamma-quartz.c b/src/gamma-quartz.c index 4645da2..3d7cde3 100644 --- a/src/gamma-quartz.c +++ b/src/gamma-quartz.c @@ -83,7 +83,7 @@ quartz_start(struct gamma_state *state, program_mode_t mode) ramp_size = CGDisplayGammaTableCapacity(display); if (!ramp_size) { - weprintf(_("Gamma ramp size too small: %i"), ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)ramp_size); return -1; } diff --git a/src/gamma-randr.c b/src/gamma-randr.c index 1c648a9..00fdc0c 100644 --- a/src/gamma-randr.c +++ b/src/gamma-randr.c @@ -181,7 +181,7 @@ randr_start(struct gamma_state *state, enum program_mode mode) free(gamma_size_reply); if (ramp_size == 0) { - weprintf(_("Gamma ramp size too small: %i"), ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)ramp_size); return -1; } diff --git a/src/gamma-vidmode.c b/src/gamma-vidmode.c index 0876f47..13ac50d 100644 --- a/src/gamma-vidmode.c +++ b/src/gamma-vidmode.c @@ -80,7 +80,7 @@ vidmode_start(struct gamma_state *state, enum program_mode mode) } if (!state->ramp_size) { - weprintf(_("Gamma ramp size too small: %i"), state->ramp_size); + weprintf(_("Gamma ramp size too small: %zu"), (size_t)state->ramp_size); return -1; } diff --git a/src/location-manual.c b/src/location-manual.c index 90f30bd..aeffa10 100644 --- a/src/location-manual.c +++ b/src/location-manual.c @@ -34,6 +34,7 @@ location_manual_init(struct location_state **state) return 0; } +GCC_ONLY(__attribute__((__pure__))) static int location_manual_start(struct location_state *state) { diff --git a/src/options.c b/src/options.c index fafc603..c25eb03 100644 --- a/src/options.c +++ b/src/options.c @@ -15,7 +15,7 @@ * along with redshift-ng. If not, see . * * Copyright (c) 2017 Jon Lund Steffensen - * Copyright (c) 2025 Mattias Andrée + * Copyright (c) 2025 Mattias Andrée */ #include "common.h" @@ -27,8 +27,8 @@ #define TRANSITION_HIGH 3.0 /* Default values for parameters. */ -#define DEFAULT_DAY_TEMP 6500 -#define DEFAULT_NIGHT_TEMP 4500 +#define DEFAULT_DAY_TEMP 6500UL +#define DEFAULT_NIGHT_TEMP 4500UL #define DEFAULT_BRIGHTNESS 1.0 #define DEFAULT_GAMMA 1.0 @@ -67,7 +67,7 @@ parse_gamma_string(const char *str, double gamma[3]) if (!s) return -1; - *(s++) = '\0'; + *s++ = '\0'; gamma[0] = atof(str); /* Red */ gamma[1] = atof(g_s); /* Blue */ gamma[2] = atof(s); /* Green */ @@ -189,8 +189,8 @@ print_help(void) /* TRANSLATORS: help output 6 */ printf(_("Default values:\n\n" - " Daytime temperature: %uK\n" - " Night temperature: %uK\n"), + " Daytime temperature: %luK\n" + " Night temperature: %luK\n"), DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP); fputs("\n", stdout); @@ -228,6 +228,7 @@ print_provider_list(void) } /* Return the gamma method with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct gamma_method * find_gamma_method(const char *name) { @@ -239,6 +240,7 @@ find_gamma_method(const char *name) } /* Return location provider with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct location_provider * find_location_provider(const char *name) { @@ -269,16 +271,16 @@ options_init(struct options *options) options->scheme.dusk.start = -1; options->scheme.dusk.end = -1; - options->scheme.day.temperature = -1; + options->scheme.day.temperature = 0; options->scheme.day.gamma[0] = NAN; options->scheme.day.brightness = NAN; - options->scheme.night.temperature = -1; + options->scheme.night.temperature = 0; options->scheme.night.gamma[0] = NAN; options->scheme.night.brightness = NAN; /* Temperature for manual mode */ - options->temp_set = -1; + options->temp_set = 0; options->method = NULL; options->method_args = NULL; @@ -457,10 +459,10 @@ static void parse_config_file_option(const char *key, const char *value, struct options *options) { if (!strcasecmp(key, "temp-day")) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = atoi(value); } else if (!strcasecmp(key, "temp-night")) { - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = atoi(value); } else if (!strcasecmp(key, "transition") || !strcasecmp(key, "fade")) { /* "fade" is preferred, "transition" is deprecated as the setting key. */ @@ -547,9 +549,9 @@ options_parse_config_file(struct options *options, struct config_ini_state *conf void options_set_defaults(struct options *options) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = DEFAULT_DAY_TEMP; - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = DEFAULT_NIGHT_TEMP; if (isnan(options->scheme.day.brightness)) 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 . * * Copyright (c) 2009-2017 Jon Lund Steffensen - * Copyright (c) 2025 Mattias Andrée + * Copyright (c) 2025 Mattias Andrée */ #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; -- cgit v1.2.3-70-g09d2