aboutsummaryrefslogtreecommitdiffstats
path: root/src/options.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c72
1 files changed, 34 insertions, 38 deletions
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 <http://www.gnu.org/licenses/>.
*
* Copyright (c) 2017 Jon Lund Steffensen <jonlst@gmail.com>
+ * Copyright (c) 2025 Mattias Andrée <m@maandre.se>
*/
#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. */
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 08:40:08 +0000