aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common.h6
-rw-r--r--src/gamma-randr.c42
-rw-r--r--src/redshift.c244
3 files changed, 105 insertions, 187 deletions
diff --git a/src/common.h b/src/common.h
index 50cb6bd..68fe931 100644
--- a/src/common.h
+++ b/src/common.h
@@ -60,10 +60,10 @@
#ifdef ENABLE_NLS
# include <libintl.h>
#else
-# define gettext(s) (s)
+# define gettext(s) s
#endif
-# define _(s) gettext(s)
-# define N_(s) (s)
+#define _(s) gettext(s)
+#define N_(s) s
/* The color temperature when no adjustment is applied. */
diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index bb4e5a0..fcb02de 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -79,7 +79,7 @@ randr_init(struct gamma_state **state)
Apparently, we have to check both to avoid seg faults. */
if (error || ver_reply == NULL) {
ec = (error != 0) ? error->error_code : -1;
- weprintf(_("`%s' returned error %i\n"), "RANDR Query Version", ec);
+ weprintf(_("`%s' returned error %i."), "RANDR Query Version", ec);
xcb_disconnect(s->conn);
free(s);
return -1;
@@ -87,8 +87,7 @@ randr_init(struct gamma_state **state)
if (ver_reply->major_version != RANDR_VERSION_MAJOR ||
ver_reply->minor_version < RANDR_VERSION_MINOR) {
- weprintf(_("Unsupported RANDR version (%u.%u)\n"),
- ver_reply->major_version, ver_reply->minor_version);
+ weprintf(_("Unsupported RANDR version (%u.%u)."), ver_reply->major_version, ver_reply->minor_version);
free(ver_reply);
xcb_disconnect(s->conn);
free(s);
@@ -131,7 +130,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
}
if (!state->screen) {
- weprintf(_("Screen %i could not be found.\n"), screen_num);
+ weprintf(_("Screen %i could not be found."), screen_num);
return -1;
}
@@ -140,7 +139,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
res_reply = xcb_randr_get_screen_resources_current_reply(state->conn, res_cookie, &error);
if (error) {
- weprintf(_("`%s' returned error %i\n"), "RANDR Get Screen Resources Current", error->error_code);
+ weprintf(_("`%s' returned error %i."), "RANDR Get Screen Resources Current", error->error_code);
return -1;
}
@@ -172,7 +171,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
gamma_size_reply = xcb_randr_get_crtc_gamma_size_reply(state->conn, gamma_size_cookie, &error);
if (error) {
- weprintf(_("`%s' returned error %i\n"), "RANDR Get CRTC Gamma Size", error->error_code);
+ weprintf(_("`%s' returned error %i."), "RANDR Get CRTC Gamma Size", error->error_code);
return -1;
}
@@ -191,7 +190,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
gamma_get_reply = xcb_randr_get_crtc_gamma_reply(state->conn, gamma_get_cookie, &error);
if (error) {
- weprintf(_("`%s' returned error %i\n"), "RANDR Get CRTC Gamma", error->error_code);
+ weprintf(_("`%s' returned error %i."), "RANDR Get CRTC Gamma", error->error_code);
return -1;
}
@@ -236,8 +235,8 @@ randr_restore(struct gamma_state *state)
error = xcb_request_check(state->conn, gamma_set_cookie);
if (error) {
- weprintf(_("`%s' returned error %i\n"), "RANDR Set CRTC Gamma", error->error_code);
- weprintf(_("Unable to restore CRTC %i\n"), i);
+ weprintf(_("`%s' returned error %i."), "RANDR Set CRTC Gamma", error->error_code);
+ weprintf(_("Unable to restore CRTC %i."), i);
}
}
}
@@ -288,8 +287,8 @@ randr_set_option(struct gamma_state *state, const char *key, const char *value)
for (;;) {
errno = 0;
parsed = strtol(local_value, &tail, 0);
- if (parsed == 0 && (errno != 0 || tail == local_value)) {
- weprintf(_("Unable to read screen number: `%s'.\n"), value);
+ if (!parsed && (errno || tail == local_value)) {
+ weprintf(_("Unable to read screen number: `%s'."), value);
return -1;
}
state->crtc_num_count += 1;
@@ -338,11 +337,10 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
uint16_t *gamma_ramps, *gamma_r, *gamma_g, *gamma_b, value;
if (crtc_num >= state->crtc_count || crtc_num < 0) {
- fprintf(stderr, _("CRTC %i does not exist. "), crtc_num);
if (state->crtc_count > 1)
- fprintf(stderr, _("Valid CRTCs are [0-%i].\n"), state->crtc_count-1);
+ weprintf(_("CRTC %i does not exist, valid CRTCs are [0-%i]."), crtc_num, state->crtc_count-1);
else
- fprintf(stderr, _("Only CRTC 0 exists.\n"));
+ weprintf(_("CRTC %i does not exist, only CRTC 0 exists."), crtc_num);
return -1;
}
@@ -380,7 +378,7 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
error = xcb_request_check(state->conn, gamma_set_cookie);
if (error) {
- weprintf(_("`%s' returned error %i\n"), "RANDR Set CRTC Gamma", error->error_code);
+ weprintf(_("`%s' returned error %i."), "RANDR Set CRTC Gamma", error->error_code);
free(gamma_ramps);
return -1;
}
@@ -393,21 +391,17 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
static int
randr_set_temperature(struct gamma_state *state, const struct color_setting *setting, int preserve)
{
- int i, r;
+ int i;
/* If no CRTC numbers have been specified, set temperature on all CRTCs. */
if (!state->crtc_num_count) {
- for (i = 0; i < state->crtc_count; i++) {
- r = randr_set_temperature_for_crtc(state, i, setting, preserve);
- if (r < 0)
+ for (i = 0; i < state->crtc_count; i++)
+ if (randr_set_temperature_for_crtc(state, i, setting, preserve) < 0)
return -1;
- }
} else {
- for (i = 0; i < state->crtc_num_count; ++i) {
- r = randr_set_temperature_for_crtc(state, state->crtc_num[i], setting, preserve);
- if (r < 0)
+ for (i = 0; i < state->crtc_num_count; ++i)
+ if (randr_set_temperature_for_crtc(state, state->crtc_num[i], setting, preserve) < 0)
return -1;
- }
}
return 0;
diff --git a/src/redshift.c b/src/redshift.c
index 53042db..70cdf38 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -758,8 +758,12 @@ main(int argc, char *argv[])
struct transition_scheme *scheme;
GAMMA_STATE *method_state;
LOCATION_STATE *location_state;
- int need_location;
- int r;
+ int r, need_location;
+ size_t i;
+ struct location loc = { NAN, NAN };
+ double now, transition_prog;
+ enum period period;
+ struct color_setting color;
argv0 = argv[0];
@@ -780,20 +784,15 @@ main(int argc, char *argv[])
setvbuf(stderr, NULL, _IOLBF, 0);
options_init(&options);
- options_parse_args(
- &options, argc, argv, gamma_methods, location_providers);
+ options_parse_args(&options, argc, argv, gamma_methods, location_providers);
/* Load settings from config file. */
- r = config_ini_init(&config_state, options.config_filepath);
- if (r < 0) {
- fputs("Unable to load config file.\n", stderr);
- exit(EXIT_FAILURE);
- }
+ if (config_ini_init(&config_state, options.config_filepath) < 0)
+ eprintf(_("Unable to load config file."));
free(options.config_filepath);
- options_parse_config_file(
- &options, &config_state, gamma_methods, location_providers);
+ options_parse_config_file(&options, &config_state, gamma_methods, location_providers);
options_set_defaults(&options);
@@ -801,12 +800,12 @@ main(int argc, char *argv[])
options.scheme.dusk.start >= 0 || options.scheme.dusk.end >= 0) {
if (options.scheme.dawn.start < 0 || options.scheme.dawn.end < 0 ||
options.scheme.dusk.start < 0 || options.scheme.dusk.end < 0)
- eprintf(_("Partial time-configuration not supported!\n"));
+ eprintf(_("Partial time-configuration not supported!"));
if (options.scheme.dawn.start > options.scheme.dawn.end ||
options.scheme.dawn.end > options.scheme.dusk.start ||
options.scheme.dusk.start > options.scheme.dusk.end)
- eprintf(_("Invalid dawn/dusk time configuration!\n"));
+ eprintf(_("Invalid dawn/dusk time configuration!"));
options.scheme.use_time = 1;
}
@@ -821,24 +820,15 @@ main(int argc, char *argv[])
if (need_location) {
if (options.provider) {
/* Use provider specified on command line. */
- r = provider_try_start(options.provider, &location_state,
- &config_state, options.provider_args);
- if (r < 0)
+ if (provider_try_start(options.provider, &location_state, &config_state, options.provider_args) < 0)
exit(EXIT_FAILURE);
} else {
/* Try all providers, use the first that works. */
- for (int i = 0;
- location_providers[i].name != NULL; i++) {
- const struct location_provider *p =
- &location_providers[i];
- fprintf(stderr,
- _("Trying location provider `%s'...\n"),
- p->name);
- r = provider_try_start(p, &location_state,
- &config_state, NULL);
- if (r < 0) {
- fputs(_("Trying next provider...\n"),
- stderr);
+ for (i = 0; location_providers[i].name != NULL; 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..."));
continue;
}
@@ -848,20 +838,14 @@ main(int argc, char *argv[])
break;
}
- /* Failure if no providers were successful at this
- point. */
- if (options.provider == NULL) {
- fputs(_("No more location providers"
- " to try.\n"), stderr);
- exit(EXIT_FAILURE);
- }
+ /* Failure if no providers were successful at this point. */
+ if (!options.provider)
+ eprintf(_("No more location providers to try."));
}
/* Solar elevations */
if (options.scheme.high < options.scheme.low) {
- fprintf(stderr,
- _("High transition elevation cannot be lower than"
- " the low transition elevation.\n"));
+ weprintf(_("High transition elevation cannot be lower than the low transition elevation."));
exit(EXIT_FAILURE);
}
@@ -876,56 +860,37 @@ main(int argc, char *argv[])
options.mode != PROGRAM_MODE_MANUAL) {
if (options.verbose) {
printf(_("Temperatures: %iK at day, %iK at night\n"),
- options.scheme.day.temperature,
- options.scheme.night.temperature);
+ 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) {
- fprintf(stderr,
- _("Temperature must be between %uK and %uK.\n"),
- MIN_TEMP, MAX_TEMP);
- exit(EXIT_FAILURE);
- }
+ options.scheme.night.temperature > MAX_TEMP)
+ eprintf(_("Temperature must be between %uK and %uK."), 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) {
- fprintf(stderr,
- _("Temperature must be between %uK and %uK.\n"),
- MIN_TEMP, MAX_TEMP);
- exit(EXIT_FAILURE);
- }
+ if (options.temp_set < MIN_TEMP || options.temp_set > MAX_TEMP)
+ eprintf(_("Temperature must be between %uK and %uK."), 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) {
- fprintf(stderr,
- _("Brightness values must be between %.1f and %.1f.\n"),
- MIN_BRIGHTNESS, MAX_BRIGHTNESS);
- exit(EXIT_FAILURE);
- }
+ options.scheme.night.brightness > MAX_BRIGHTNESS)
+ eprintf(_("Brightness values must be between %.1f and %.1f."), MIN_BRIGHTNESS, MAX_BRIGHTNESS);
- if (options.verbose) {
- printf(_("Brightness: %.2f:%.2f\n"),
- options.scheme.day.brightness,
- options.scheme.night.brightness);
- }
+ if (options.verbose)
+ printf(_("Brightness: %.2f:%.2f\n"), options.scheme.day.brightness, options.scheme.night.brightness);
/* Gamma */
if (!gamma_is_valid(options.scheme.day.gamma) ||
!gamma_is_valid(options.scheme.night.gamma)) {
- fprintf(stderr,
- _("Gamma value must be between %.1f and %.1f.\n"),
- MIN_GAMMA, MAX_GAMMA);
+ weprintf(_("Gamma value must be between %.1f and %.1f."), MIN_GAMMA, MAX_GAMMA);
exit(EXIT_FAILURE);
}
@@ -949,23 +914,21 @@ main(int argc, char *argv[])
/* Gamma adjustment not needed for print mode */
if (options.mode != PROGRAM_MODE_PRINT) {
- if (options.method != NULL) {
+ 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) exit(EXIT_FAILURE);
+ r = method_try_start(options.method, &method_state, options.mode,
+ &config_state, options.method_args);
+ if (r < 0)
+ exit(EXIT_FAILURE);
} else {
/* Try all methods, use the first that works. */
- int i;
- for (i = 0; gamma_methods[i].name != NULL; i++) {
+ for (i = 0; gamma_methods[i].name; i++) {
const struct gamma_method *m = &gamma_methods[i];
- if (!m->autostart) continue;
+ if (!m->autostart)
+ continue;
- r = method_try_start(
- m, &method_state, options.mode, &config_state, NULL);
- if (r < 0) {
- fputs(_("Trying next method...\n"), stderr);
+ if (method_try_start(m, &method_state, options.mode, &config_state, NULL) < 0) {
+ weprintf(_("Trying next method..."));
continue;
}
@@ -976,10 +939,8 @@ main(int argc, char *argv[])
}
/* Failure if no methods were successful at this point. */
- if (options.method == NULL) {
- fputs(_("No more methods to try.\n"), stderr);
- exit(EXIT_FAILURE);
- }
+ if (!options.method)
+ eprintf(_("No more methods to try."));
}
}
@@ -988,78 +949,55 @@ main(int argc, char *argv[])
switch (options.mode) {
case PROGRAM_MODE_ONE_SHOT:
case PROGRAM_MODE_PRINT:
- {
- struct location loc = { NAN, NAN };
- double now;
- enum period period;
- double transition_prog;
- struct color_setting interp;
-
if (need_location) {
- fputs(_("Waiting for current location"
- " to become available...\n"), stderr);
+ weprintf(_("Waiting for current location to become available..."));
/* Wait for location provider. */
- if (provider_get_location(options.provider, location_state, -1, &loc) < 0) {
- fputs(_("Unable to get location"
- " from provider.\n"), stderr);
- exit(EXIT_FAILURE);
- }
+ if (provider_get_location(options.provider, location_state, -1, &loc) < 0)
+ eprintf(_("Unable to get location from provider."));
- if (!location_is_valid(&loc)) {
- exit(EXIT_FAILURE);
- }
+ if (!location_is_valid(&loc))
+ exit(1);
print_location(&loc);
}
r = systemtime_get_time(&now);
if (r < 0) {
- fputs(_("Unable to read system time.\n"), stderr);
+ weprintf(_("Unable to read system time."));
options.method->free(method_state);
- exit(EXIT_FAILURE);
+ exit(1);
}
if (options.scheme.use_time) {
int time_offset = get_seconds_since_midnight(now);
period = get_period_from_time(scheme, time_offset);
- transition_prog = get_transition_progress_from_time(
- scheme, time_offset);
+ transition_prog = get_transition_progress_from_time(scheme, time_offset);
} else {
/* Current angular elevation of the sun */
- double elevation = solar_elevation(
- now, loc.lat, loc.lon);
+ double elevation = solar_elevation(now, loc.lat, loc.lon);
if (options.verbose) {
- /* TRANSLATORS: Append degree symbol if
- possible. */
+ /* TRANSLATORS: Append degree symbol if possible. */
printf(_("Solar elevation: %f\n"), elevation);
}
period = get_period_from_elevation(scheme, elevation);
- transition_prog =
- get_transition_progress_from_elevation(
- scheme, elevation);
+ transition_prog = get_transition_progress_from_elevation(scheme, elevation);
}
/* Use transition progress to set color temperature */
- interpolate_transition_scheme(
- scheme, transition_prog, &interp);
+ interpolate_transition_scheme(scheme, transition_prog, &color);
if (options.verbose || options.mode == PROGRAM_MODE_PRINT) {
print_period(period, transition_prog);
- printf(_("Color temperature: %uK\n"),
- interp.temperature);
- printf(_("Brightness: %.2f\n"),
- interp.brightness);
+ printf(_("Color temperature: %uK\n"), color.temperature);
+ printf(_("Brightness: %.2f\n"), color.brightness);
}
if (options.mode != PROGRAM_MODE_PRINT) {
/* Adjust temperature */
- r = options.method->set_temperature(
- method_state, &interp, options.preserve_gamma);
- if (r < 0) {
- fputs(_("Temperature adjustment failed.\n"),
- stderr);
+ if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0) {
+ weprintf(_("Temperature adjustment failed."));
options.method->free(method_state);
exit(EXIT_FAILURE);
}
@@ -1068,29 +1006,23 @@ main(int argc, char *argv[])
automatically revert when the process exits.
Therefore, we have to loop until CTRL-C is received.
*/
- if (strcmp(options.method->name, "quartz") == 0) {
- fputs(_("Press ctrl-c to stop...\n"), stderr);
+ if (!strcmp(options.method->name, "quartz")) {
+ weprintf(_("Press ctrl-c to stop..."));
pause();
}
}
- }
- break;
- case PROGRAM_MODE_MANUAL:
- {
- struct color_setting manual;
+ break;
- if (options.verbose) {
- printf(_("Color temperature: %uK\n"),
- options.temp_set);
- }
+ case PROGRAM_MODE_MANUAL:
+ if (options.verbose)
+ printf(_("Color temperature: %uK\n"), options.temp_set);
/* Adjust temperature */
- manual = scheme->day;
- manual.temperature = options.temp_set;
- r = options.method->set_temperature(
- method_state, &manual, options.preserve_gamma);
+ color = scheme->day;
+ color.temperature = options.temp_set;
+ r = options.method->set_temperature(method_state, &color, options.preserve_gamma);
if (r < 0) {
- fputs(_("Temperature adjustment failed.\n"), stderr);
+ weprintf(_("Temperature adjustment failed."));
options.method->free(method_state);
exit(EXIT_FAILURE);
}
@@ -1098,21 +1030,18 @@ main(int argc, char *argv[])
/* In Quartz (OSX) the gamma adjustments will automatically
revert when the process exits. Therefore, we have to loop
until CTRL-C is received. */
- if (strcmp(options.method->name, "quartz") == 0) {
- fputs(_("Press ctrl-c to stop...\n"), stderr);
+ if (!strcmp(options.method->name, "quartz")) {
+ weprintf(_("Press ctrl-c to stop..."));
pause();
}
- }
- break;
+ break;
+
case PROGRAM_MODE_RESET:
- {
/* Reset screen */
- struct color_setting reset;
- color_setting_reset(&reset);
+ color_setting_reset(&color);
- r = options.method->set_temperature(method_state, &reset, 0);
- if (r < 0) {
- fputs(_("Temperature adjustment failed.\n"), stderr);
+ if (options.method->set_temperature(method_state, &color, 0) < 0) {
+ weprintf(_("Temperature adjustment failed."));
options.method->free(method_state);
exit(EXIT_FAILURE);
}
@@ -1120,23 +1049,18 @@ main(int argc, char *argv[])
/* In Quartz (OSX) the gamma adjustments will automatically
revert when the process exits. Therefore, we have to loop
until CTRL-C is received. */
- if (strcmp(options.method->name, "quartz") == 0) {
- fputs(_("Press ctrl-c to stop...\n"), stderr);
+ if (!strcmp(options.method->name, "quartz")) {
+ weprintf(_("Press ctrl-c to stop..."));
pause();
}
- }
- break;
+ break;
+
case PROGRAM_MODE_CONTINUAL:
- {
- r = run_continual_mode(
- options.provider, location_state, scheme,
- options.method, method_state,
- options.use_fade, options.preserve_gamma,
- options.verbose);
+ r = run_continual_mode(options.provider, location_state, scheme, options.method, method_state,
+ options.use_fade, options.preserve_gamma, options.verbose);
if (r < 0)
exit(EXIT_FAILURE);
- }
- break;
+ break;
}
/* Clean up gamma adjustment state */
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 08:39:55 +0000