aboutsummaryrefslogtreecommitdiffstats
path: root/src/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c114
1 files changed, 94 insertions, 20 deletions
diff --git a/src/config.c b/src/config.c
index 03d0e74..ed61486 100644
--- a/src/config.c
+++ b/src/config.c
@@ -26,9 +26,10 @@
static void
usage(void)
{
- fprintf(stderr, _("usage: %s %s"), argv0,
- _("[-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] | -h | -V"));
+ fprintf(stderr, _("usage: %s %s\n"), argv0,
+ _("[-b brightness] [-c file] [-g gamma] [-l latitude:longitude | -l provider[:options]] "
+ "[-m method[:options]] [-O temperature | -o | -p | -t temperature | -x] [-P | +P] "
+ "[-r | +r] [-dv] | -h | -V"));
exit(1);
}
@@ -46,7 +47,7 @@ int verbose = 0;
* Print general help text
*/
static void
-print_help(void) /* TODO clean up */
+print_help(void) /* TODO clean up; add new options */
{
/* TRANSLATORS: help output 1
LAT is latitude, LON is longitude,
@@ -108,6 +109,49 @@ print_help(void) /* TODO clean up */
/**
+ * Parse a boolean string
+ *
+ * @param s The string to parse
+ * @param key The name of the configuration assigned the value `s`
+ * @return 1 if `s` represents true, 0 if `s` represents false
+ */
+GCC_ONLY(__attribute__((__pure__)))
+static int
+get_boolean(const char *s, const char *key)
+{
+ int ret;
+ if (s[0] == '0' || s[0] == '1') {
+ ret = s[0] - '0';
+ if (s[1])
+ goto bad;
+ } else {
+ bad:
+ eprintf(_("Value of configuration `%s' must be either `1' or `0'."), key);
+ }
+ return ret;
+}
+
+
+/**
+ * atof(3)-like wrapper for strtod(3) that checks that the string is valid
+ *
+ * @param s The string to parse
+ * @param key The name of the configuration assigned the value `s`
+ * @return The encoded value
+ */
+static double
+checked_atof(const char *s, const char *key)
+{
+ double ret;
+ errno = 0;
+ ret = strtod(s, (void *)&s);
+ if (errno || *s)
+ eprintf(_("Value of configuration `%s' is not a value decimal value."), key);
+ return ret;
+}
+
+
+/**
* Split a list of values, and remove leading and trailing whitespace
* from each value
*
@@ -460,7 +504,10 @@ set_transition_time(char *str, struct setting_time *start, struct setting_time *
if (!strs[i] || settings[i]->source > source)
continue;
if (settings[i]->source & SETTING_CONFIGFILE) {
- /* TODO */
+ if (i == 0)
+ weprintf(_("Start value for `%s' specified multiple times in configuration file."), key);
+ else
+ weprintf(_("End value for `%s' specified multiple times in configuration file."), key);
}
settings[i]->source |= source;
settings[i]->value = parse_time(strs[i]);
@@ -504,7 +551,7 @@ print_provider_list(void)
printf(" %s\n", location_providers[i]->name);
printf("\n");
- printf(_("Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n"));
+ printf(_("Specify colon-separated options with `-l PROVIDER:OPTIONS'.\n"));
/* TRANSLATORS: `help' must not be translated. */
printf(_("Try `-l PROVIDER:help' for help.\n"));
}
@@ -558,6 +605,7 @@ load_defaults(struct settings *settings)
memset(settings, 0, sizeof(*settings)); /* set each `.source` to `SETTING_DEFAULT` and booleans to 0 */
settings->config_file = NULL;
+ settings->until_death = 0;
settings->day.temperature.value = DEFAULT_DAY_TEMPERATURE;
settings->day.brightness.value = DEFAULT_DAY_BRIGHTNESS;
@@ -608,6 +656,10 @@ load_from_cmdline(struct settings *settings, int argc, char *argv[])
settings->config_file = ARG();
break;
+ case 'd':
+ settings->until_death = 1;
+ break;
+
case 'g':
set_gamma(ARG(), &settings->day.gamma, &settings->night.gamma, NULL);
break;
@@ -723,6 +775,20 @@ load_from_cmdline(struct settings *settings, int argc, char *argv[])
default:
usage();
+
+ } ARGALT('+') {
+ case 'P':
+ settings->preserve_gamma.source |= SETTING_CMDLINE;
+ settings->preserve_gamma.value = 1;
+ break;
+
+ case 'r':
+ settings->use_fade.source |= SETTING_CMDLINE;
+ settings->use_fade.value = 1;
+ break;
+
+ default:
+ usage();
} ARGEND;
if (argc)
@@ -740,13 +806,11 @@ load_from_cmdline(struct settings *settings, int argc, char *argv[])
static void
load_from_config_ini(struct settings *settings, const char *key, char *value)
{
- /* TODO add "temperature" as alias to "temp" (with {,-day,-night} suffix) */
-
- if (!strcasecmp(key, "temp")) { /* TODO new entry */
+ if (!strcasecmp(key, "temp") || !strcasecmp(key, "temperature")) {
set_temperature(value, &settings->day.temperature, &settings->night.temperature, key);
- } else if (!strcasecmp(key, "temp-day")) {
+ } else if (!strcasecmp(key, "temp-day") || !strcasecmp(key, "temperature-day")) {
set_temperature(value, &settings->day.temperature, NULL, key);
- } else if (!strcasecmp(key, "temp-night")) {
+ } else if (!strcasecmp(key, "temp-night") || !strcasecmp(key, "temperature-night")) {
set_temperature(value, NULL, &settings->night.temperature, key);
} else if (!strcasecmp(key, "brightness")) {
@@ -772,28 +836,28 @@ load_from_config_ini(struct settings *settings, const char *key, char *value)
weprintf(_("`fade' setting specified multiple times in configuration file."));
settings->use_fade.source |= SETTING_CONFIGFILE;
if (settings->use_fade.source <= SETTING_CONFIGFILE)
- settings->use_fade.value = !!atoi(value); /* TODO */
+ settings->use_fade.value = get_boolean(value, key);
} else if (!strcasecmp(key, "preserve-gamma")) {
if (settings->preserve_gamma.source & SETTING_CONFIGFILE)
weprintf(_("`preserve-gamma' setting specified multiple times in configuration file."));
settings->preserve_gamma.source |= SETTING_CONFIGFILE;
if (settings->preserve_gamma.source <= SETTING_CONFIGFILE)
- settings->preserve_gamma.value = !!atoi(value); /* TODO */
+ settings->preserve_gamma.value = get_boolean(value, key);
} else if (!strcasecmp(key, "elevation-high")) {
if (settings->elevation_high.source & SETTING_CONFIGFILE)
weprintf(_("`elevation-high' setting specified multiple times in configuration file."));
settings->elevation_high.source |= SETTING_CONFIGFILE;
if (settings->elevation_high.source <= SETTING_CONFIGFILE)
- settings->elevation_high.value = atof(value); /* TODO */
+ settings->elevation_high.value = checked_atof(value, key);
} else if (!strcasecmp(key, "elevation-low")) {
if (settings->elevation_low.source & SETTING_CONFIGFILE)
weprintf(_("`elevation-low' setting specified multiple times in configuration file."));
settings->elevation_low.source |= SETTING_CONFIGFILE;
if (settings->elevation_low.source <= SETTING_CONFIGFILE)
- settings->elevation_low.value = atof(value); /* TODO */
+ settings->elevation_low.value = checked_atof(value, key);
} else if (!strcasecmp(key, "dawn-time")) {
if (!set_transition_time(value, &settings->dawn.start, &settings->dawn.end, key))
@@ -822,6 +886,7 @@ load_settings(struct settings *settings, int argc, char *argv[])
{
struct config_ini_section *section;
struct config_ini_setting *setting;
+ const struct time_period *first, *current;
int i, j, n;
time_t duration;
@@ -866,7 +931,7 @@ load_settings(struct settings *settings, int argc, char *argv[])
if (settings->elevation_high.value < settings->elevation_low.value)
eprintf(_("High transition elevation cannot be lower than the low transition elevation."));
- /* If reseting effects, use neutral colour settings (static scheme) and do not preserve gamma */
+ /* If resetting effects, use neutral colour settings (static scheme) and do not preserve gamma */
if (mode == PROGRAM_MODE_RESET) {
scheme.type = STATIC_SCHEME;
settings->preserve_gamma.value = 0;
@@ -876,6 +941,8 @@ load_settings(struct settings *settings, int argc, char *argv[])
}
/* Publish loaded settings */
+ if (mode == PROGRAM_MODE_ONE_SHOT && settings->until_death)
+ mode = PROGRAM_MODE_UNTIL_DEATH;
preserve_gamma = settings->preserve_gamma.value;
use_fade = settings->use_fade.value;
day_settings.temperature = settings->day.temperature.value;
@@ -924,11 +991,18 @@ settings_published:
/* TRANSLATORS: Append degree symbols if possible. */
printf(_("Solar elevations: day above %.1f, night below %.1f\n"),
scheme.elevation.high, scheme.elevation.low);
+ } else if (scheme.type == CLOCK_SCHEME) {/
+ printf(_("Schedule:\n"));
+ current = first = scheme.time.periods;
+ do {
+ printf(_(" %.2f%% day at %02u:%02u:%02u\n"),
+ current->day_level * 100, current->start / 60 / 60 % 24,
+ current->start / 60 % 60, current->start % 60);
+ } while ((current = current->next) != first);
+ printf(_("(End of schedule)\n"));
}
- if (scheme.type != STATIC_SCHEME) {
- printf(_("Temperatures: %luK at day, %luK at night\n"),
- day_settings.temperature, night_settings.temperature);
- }
+ printf(_("Temperatures: %luK at day, %luK at night\n"),
+ day_settings.temperature, night_settings.temperature);
printf(_("Brightness: %.2f:%.2f\n"), settings->day.brightness.value, settings->night.brightness.value);
/* TRANSLATORS: The string in parenthesis is either Daytime or Night (translated). */
printf(_("Gamma (%s): %.3f, %.3f, %.3f\n"), _("Daytime"),
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 08:40:00 +0000