From 46739dda053de12e4222b6ecfa6d09ca3b8fa78a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 8 Mar 2025 10:48:27 +0100 Subject: Misc improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/common.h | 39 +++++++++++++----- src/gamma-coopgamma.c | 2 +- src/hooks.c | 2 +- src/options.c | 72 +++++++++++++++----------------- src/redshift.c | 112 +++++++++++++++++++++++++------------------------- src/systemtime.c | 2 +- 6 files changed, 121 insertions(+), 108 deletions(-) (limited to 'src') diff --git a/src/common.h b/src/common.h index 7baedae..ca9e439 100644 --- a/src/common.h +++ b/src/common.h @@ -57,14 +57,30 @@ #include + #ifdef ENABLE_NLS # include #else # define gettext(s) s #endif + +/** + * List for translation, and translate in place + * + * @param s:string-literal Translatable string + * @return :const char * Translation of `s` + */ #define _(s) gettext(s) + +/** + * List for translation without translating in place + * + * @param s:string-literal Translatable string + * @return :string-literal `s` as is + */ #define N_(s) s + #if defined(__GNUC__) # define GCC_ONLY(...) __VA_ARGS__ #else @@ -78,9 +94,6 @@ #define NEUTRAL_TEMP 6500 -#define SOLAR_CIVIL_TWILIGHT_ELEV -6.0 - - /** * Truncate a value into a bounded range * @@ -234,6 +247,17 @@ struct location_provider { }; +/** + * `NULL` terminated list of adjustment methods + */ +extern const struct gamma_method *gamma_methods[]; + +/** + * `NULL` terminated list of location providers + */ +extern const struct location_provider *location_providers[]; + + #define LIST_RAMPS_STOP_VALUE_TYPES(X, D)\ X(u8, uint8_t, UINT8_MAX, 8) D\ X(u16, uint16_t, UINT16_MAX, 16) D\ @@ -290,12 +314,8 @@ struct config_ini_section *config_ini_get_section(struct config_ini_state *state void options_init(struct options *options); -void options_parse_args(struct options *options, int argc, char *argv[], - const struct gamma_method *gamma_methods, - const struct location_provider *location_providers); -void options_parse_config_file(struct options *options, struct config_ini_state *config_state, - const struct gamma_method *gamma_methods, - const struct location_provider *location_providers); +void options_parse_args(struct options *options, int argc, char *argv[]); +void options_parse_config_file(struct options *options, struct config_ini_state *config_state); void options_set_defaults(struct options *options); @@ -326,7 +346,6 @@ extern volatile sig_atomic_t exiting; */ extern volatile sig_atomic_t disable; - /** * Install signal handlers for the process */ diff --git a/src/gamma-coopgamma.c b/src/gamma-coopgamma.c index e108e86..db0db4a 100644 --- a/src/gamma-coopgamma.c +++ b/src/gamma-coopgamma.c @@ -422,7 +422,7 @@ coopgamma_set_option(struct gamma_state *state, const char *key, const char *val printf(" %s\n", state->methods[i]); if (ferror(stdout)) eprintf("printf:"); - exit(EXIT_SUCCESS); + exit(0); } state->method = estrdup(value); } else if (!strcasecmp(key, "display")) { diff --git a/src/hooks.c b/src/hooks.c index 4574742..a19c60d 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -105,7 +105,7 @@ hooks_signal_period_change(enum period prev_period, enum period period) weprintf("execl %s:", hook_path); /* Only reached on error */ - _exit(EXIT_FAILURE); + _exit(1); default: /* SIGCHLD is ignored */ break; diff --git a/src/options.c b/src/options.c index f115fb3..3369fe1 100644 --- a/src/options.c +++ b/src/options.c @@ -15,6 +15,7 @@ * along with redshift-ng. If not, see . * * Copyright (c) 2017 Jon Lund Steffensen + * Copyright (c) 2025 Mattias Andrée */ #include "common.h" @@ -22,7 +23,7 @@ transition period starts and ends (in degress). Transition during twilight, and while the sun is lower than 3.0 degrees above the horizon. */ -#define TRANSITION_LOW SOLAR_CIVIL_TWILIGHT_ELEV +#define TRANSITION_LOW LIBRED_SOLAR_ELEVATION_CIVIL_DUSK_DAWN #define TRANSITION_HIGH 3.0 /* Default values for parameters. */ @@ -130,15 +131,14 @@ parse_transition_range(const char *str, struct time_range *range) /* Print help text. */ static void -print_help(const char *program_name) +print_help(void) { /* TRANSLATORS: help output 1 LAT is latitude, LON is longitude, DAY is temperature at daytime, NIGHT is temperature at night no-wrap */ - printf(_("Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"), - program_name); + printf(_("Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"), argv0); fputs("\n", stdout); /* TRANSLATORS: help output 2 @@ -198,13 +198,13 @@ print_help(const char *program_name) /* Print list of adjustment methods. */ static void -print_method_list(const struct gamma_method *gamma_methods) +print_method_list(void) { size_t i; fputs(_("Available adjustment methods:\n"), stdout); - for (i = 0; gamma_methods[i].name != NULL; i++) - printf(" %s\n", gamma_methods[i].name); + for (i = 0; gamma_methods[i]; i++) + printf(" %s\n", gamma_methods[i]->name); fputs("\n", stdout); fputs(_("Specify colon-separated options with `-m METHOD:OPTIONS'.\n"), stdout); @@ -214,11 +214,11 @@ print_method_list(const struct gamma_method *gamma_methods) /* Print list of location providers. */ static void -print_provider_list(const struct location_provider *location_providers) +print_provider_list(void) { fputs(_("Available location providers:\n"), stdout); - for (int i = 0; location_providers[i].name != NULL; i++) { - printf(" %s\n", location_providers[i].name); + for (int i = 0; location_providers[i]; i++) { + printf(" %s\n", location_providers[i]->name); } fputs("\n", stdout); @@ -229,23 +229,23 @@ print_provider_list(const struct location_provider *location_providers) /* Return the gamma method with the given name. */ static const struct gamma_method * -find_gamma_method(const struct gamma_method *gamma_methods, const char *name) +find_gamma_method(const char *name) { size_t i; - for (i = 0; gamma_methods[i].name; i++) - if (!strcasecmp(name, gamma_methods[i].name)) - return &gamma_methods[i]; + for (i = 0; gamma_methods[i]; i++) + if (!strcasecmp(name, gamma_methods[i]->name)) + return gamma_methods[i]; return NULL; } /* Return location provider with the given name. */ static const struct location_provider * -find_location_provider(const struct location_provider *location_providers, const char *name) +find_location_provider(const char *name) { size_t i; - for (i = 0; location_providers[i].name != NULL; i++) { - if (!strcasecmp(name, location_providers[i].name)) - return &location_providers[i]; + for (i = 0; location_providers[i]; i++) { + if (!strcasecmp(name, location_providers[i]->name)) + return location_providers[i]; } return NULL; } @@ -294,8 +294,7 @@ options_init(struct options *options) /* Parse a single option from the command-line. */ static int -parse_command_line_option(const char option, char *value, struct options *options, const char *program_name, - const struct gamma_method *gamma_methods, const struct location_provider *location_providers) +parse_command_line_option(const char option, char *value, struct options *options) { const char *provider_name; char *s, *end; @@ -324,13 +323,13 @@ parse_command_line_option(const char option, char *value, struct options *option break; case 'h': - print_help(program_name); + print_help(); exit(0); case 'l': /* Print list of providers if argument is `list' */ if (!strcasecmp(value, "list")) { - print_provider_list(location_providers); + print_provider_list(); exit(0); } @@ -356,7 +355,7 @@ parse_command_line_option(const char option, char *value, struct options *option } /* Lookup provider from name. */ - options->provider = find_location_provider(location_providers, provider_name); + options->provider = find_location_provider(provider_name); if (!options->provider) { weprintf(_("Unknown location provider `%s'."), provider_name); return -1; @@ -372,7 +371,7 @@ parse_command_line_option(const char option, char *value, struct options *option case 'm': /* Print list of methods if argument is `list' */ if (!strcasecmp(value, "list")) { - print_method_list(gamma_methods); + print_method_list(); exit(0); } @@ -384,7 +383,7 @@ parse_command_line_option(const char option, char *value, struct options *option } /* Find adjustment method by name. */ - options->method = find_gamma_method(gamma_methods, value); + options->method = find_gamma_method(value); if (!options->method) { /* TRANSLATORS: This refers to the method used to adjust colors e.g. VidMode */ weprintf(_("Unknown adjustment method `%s'."), value); @@ -437,7 +436,7 @@ parse_command_line_option(const char option, char *value, struct options *option case 'V': printf("%s\n", PACKAGE_STRING); - exit(EXIT_SUCCESS); + exit(0); break; case 'x': @@ -454,19 +453,17 @@ parse_command_line_option(const char option, char *value, struct options *option /* Parse command line arguments. */ void -options_parse_args(struct options *options, int argc, char *argv[], const struct gamma_method *gamma_methods, - const struct location_provider *location_providers) +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) - if (parse_command_line_option(opt, optarg, options, argv0, gamma_methods, location_providers) < 0) - exit(EXIT_FAILURE); + if (parse_command_line_option(opt, optarg, options) < 0) + exit(1); } /* Parse a single key-value pair from the configuration file. */ static int -parse_config_file_option(const char *key, const char *value, struct options *options, - const struct gamma_method *gamma_methods, const struct location_provider *location_providers) +parse_config_file_option(const char *key, const char *value, struct options *options) { if (!strcasecmp(key, "temp-day")) { if (options->scheme.day.temperature < 0) @@ -520,7 +517,7 @@ parse_config_file_option(const char *key, const char *value, struct options *opt options->preserve_gamma = !!atoi(value); } else if (!strcasecmp(key, "adjustment-method")) { if (!options->method) { - options->method = find_gamma_method(gamma_methods, value); + options->method = find_gamma_method(value); if (!options->method) { weprintf(_("Unknown adjustment method `%s'."), value); return -1; @@ -528,7 +525,7 @@ parse_config_file_option(const char *key, const char *value, struct options *opt } } else if (!strcasecmp(key, "location-provider")) { if (!options->provider) { - options->provider = find_location_provider(location_providers, value); + options->provider = find_location_provider(value); if (!options->provider) { weprintf(_("Unknown location provider `%s'."), value); return -1; @@ -557,8 +554,7 @@ parse_config_file_option(const char *key, const char *value, struct options *opt /* Parse options defined in the config file. */ void -options_parse_config_file(struct options *options, struct config_ini_state *config_state, - const struct gamma_method *gamma_methods, const struct location_provider *location_providers) +options_parse_config_file(struct options *options, struct config_ini_state *config_state) { struct config_ini_section *section; struct config_ini_setting *setting; @@ -569,8 +565,8 @@ options_parse_config_file(struct options *options, struct config_ini_state *conf return; for (setting = section->settings; setting; setting = setting->next) - if (parse_config_file_option(setting->name, setting->value, options, gamma_methods, location_providers) < 0) - exit(EXIT_FAILURE); + if (parse_config_file_option(setting->name, setting->value, options) < 0) + exit(1); } /* Replace unspecified options with default values. */ diff --git a/src/redshift.c b/src/redshift.c index b149754..836a848 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -54,6 +54,43 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } /* Length of fade in numbers of short sleep durations. */ #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 */ @@ -200,11 +237,11 @@ 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 || - 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); + return abs(first->temperature - second->temperature) > 25 || + 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. */ @@ -329,14 +366,14 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state, key = args; value = strchr(args, '='); if (!value) { - weprintf(_("Failed to parse option `%s'.\n"), args); /* TODO \n */ + 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.\n"), method->name); /* TODO \n */ + 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; @@ -450,12 +487,9 @@ ease_fade(double t) current time and continuously updates the screen to the appropriate color 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) +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) { int done = 0; int prev_disabled = 1; @@ -676,42 +710,6 @@ run_continual_mode(const struct location_provider *provider, int main(int argc, char *argv[]) { - /* List of gamma methods. */ - 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 } - }; - - /* List of location providers. */ - const struct location_provider location_providers[] = { -#ifdef ENABLE_GEOCLUE2 - geoclue2_location_provider, -#endif -#ifdef ENABLE_CORELOCATION - corelocation_location_provider, -#endif - manual_location_provider, - { NULL } - }; - struct options options; struct config_ini_state config_state; struct transition_scheme *scheme; @@ -734,14 +732,14 @@ main(int argc, char *argv[]) #endif options_init(&options); - options_parse_args(&options, argc, argv, gamma_methods, location_providers); + 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, gamma_methods, location_providers); + options_parse_config_file(&options, &config_state); options_set_defaults(&options); @@ -770,11 +768,11 @@ main(int argc, char *argv[]) if (options.provider) { /* Use provider specified on command line. */ if (provider_try_start(options.provider, &location_state, &config_state, options.provider_args) < 0) - exit(EXIT_FAILURE); + exit(1); } else { /* Try all providers, use the first that works. */ - for (i = 0; location_providers[i].name != NULL; i++) { - const struct location_provider *p = &location_providers[i]; + 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...")); @@ -865,11 +863,11 @@ main(int argc, char *argv[]) r = method_try_start(options.method, &method_state, options.mode, &config_state, options.method_args); if (r < 0) - exit(EXIT_FAILURE); + exit(1); } else { /* Try all methods, use the first that works. */ - for (i = 0; gamma_methods[i].name; i++) { - const struct gamma_method *m = &gamma_methods[i]; + for (i = 0; gamma_methods[i]; i++) { + const struct gamma_method *m = gamma_methods[i]; if (!m->autostart) continue; diff --git a/src/systemtime.c b/src/systemtime.c index 8ca845c..17f516b 100644 --- a/src/systemtime.c +++ b/src/systemtime.c @@ -42,7 +42,7 @@ systemtime_get_time(void) struct timeval now; if (gettimeofday(&now, NULL)) eprintf("gettimeofday:"); - return = now.tv_sec + (now.tv_usec / 1000000.0); + return now.tv_sec + (now.tv_usec / 1000000.0); #endif } -- cgit v1.2.3-70-g09d2