diff options
| -rw-r--r-- | README | 207 | ||||
| -rw-r--r-- | TODO | 22 | ||||
| -rw-r--r-- | redshift.1 | 26 | ||||
| -rw-r--r-- | src/common.h | 23 | ||||
| -rw-r--r-- | src/config.c | 114 | ||||
| -rw-r--r-- | src/gamma-coopgamma.c | 1 | ||||
| -rw-r--r-- | src/location-geoclue2.c | 3 | ||||
| -rw-r--r-- | src/location.c | 5 | ||||
| -rw-r--r-- | src/redshift.c | 36 | ||||
| -rw-r--r-- | src/signals.c | 51 | ||||
| -rw-r--r-- | src/util.c | 10 |
11 files changed, 423 insertions, 75 deletions
@@ -8,9 +8,14 @@ NAME redshift - Automatically adjust display colour temperature according the Sun SYNOPSIS - redshift [-b day:night] [-c file] [-g r:g:b] [-m method[:options]] + redshift [-b brightness] [-c file] [-g gamma] [-m method[:options]] [-l latitude:longitude | -l provider[:options]] - [-o | -O temperature | -t day:night | -x] [-pPrv] | -h | -V + [-O temperature | -o | -p | -t temperature | -x] [-P | +P] + [-r | +r] [-dv] + + redshift -h + + redshift -V DESCRIPTION redshift adjusts the colour temperature of your screen according to your @@ -27,7 +32,7 @@ DESCRIPTION typically a low temperature at around 3000K–4000K (default is 4500K). During the day, the colour temperature should match the light from outside. Typically around 5500K–6500K (default is 6500K). The light has - a higher temperature on an overcast day. + a lower temperature on an overcast day. In addition to the command-line tool redshift, the GUI redshift-gtk provides an alternative interface that shows up as a notification icon @@ -36,17 +41,48 @@ DESCRIPTION OPTIONS The following options are supported: + -b brightness + Synonym for "-b brightness:brightness". + -b day:night Screen brightness to apply at daytime and at nighttime. (Default: 1:1) - The value most be between 0.1 and 1.0. + The values most be between 0.1 and 1.0. + + day or night may be omitted, to keep unmodified, however + at least one must be specified. -c file Load settings from specified configuration file. + -d + Keep the process alive and remove the colour effects + when killed. + + Ignored for -p and -x; always active for -t and the + "quartz" adjustment method. + + -g gamma + Synonym for "-g gamma:gamma". + + -g day:night + Synonym for "-g day:day:day:night:night:night". + -g r:g:b - Additional gamma correction to apply. (Default: 1:1:1) + Synonym for "-g r:g:b:r:g:b". + + -g day-r:day-g:day-b:night-r:night-g:night-b + Additional gamma correction to apply at daytime and + at nighttime. (Default: 1:1:1:1:1:1) + + The values most be between 0.1 and 10.0. + + day-r:day-g:day-b or night-r:night-g:night-b may be omitted, + to keep unmodified, however at least one set must be specified. + Individual components of one set cannot be omitted, either + nothing is omitted or an entire set, including its two colons + (:) are omitted. -h Display help message. @@ -78,23 +114,44 @@ OPTIONS before applying the new color temperature. -O temperature - One-shot manual mode (set colour temperature). + This is a synonym for "-O temperature:temperature". + + -O day:night + One-shot manual mode (set colour temperature). The colour set + is interpolated between day and night depending on the Sun's + elevation or the clock time (depending on which redshift is + configured to use). + + Values must be at least 1000 and integral. Use this with the -P option to clear the existing gamma ramps before applying the new color temperature. + This is a synonym for "-t day:night -o". + -p Print parameter and exit. -P - Reset exiting gamma ramps before applying new scolour effects. + Reset exiting gamma ramps before applying new colour effects. + + +P + Preserve preexisting gamma adjustments. (Default) -r Disable fading between colour temperatures. + +r + Enable fading between colour temperatures. (Default) + + -t temperature + This is a synonym for "-t temperature:temperature". + -t day:night Colour temperature to set at daytime and at nighttime. + Values must be at least 1000 and integral. + -v Enable verbose output. @@ -104,6 +161,17 @@ OPTIONS -x Remove adjustments from screen. + For mutually exclusive options or options specified multiple times, + the last specified takes effect, except the first specified option + that outputs text (except -p) is used. However, if the daytime + value or nighttime value is omitted for an option, the last previously + specified value will be used; that is, for example, "-t 5000:" and + "-t :3000" do not override each other, but "-t 5000:" overrides, + if specified later, "6000" but not "3000" in "-t 6000:3000". + + Options in the command line override settings from the configuration + file. + OPERANDS None. @@ -126,7 +194,117 @@ ASYNCHRONOUS EVENTS reenable them. STDOUT - TODO + The standard output is used to print state information and requested + help information. The output is subject to localisation, and the + following formats apply for the "C" locale. Applications taking use + of this information must make sure to set the message locale to "C". + For floating-point values ("%f") the precision is not documented as + it may change between versions and applications should not expect any + particular precision to be used. + + When "-m list" is specified the available gamma ramp adjustment methods + are printed with the header "Available adjustment methods:\n" followed + by the list in the format + + "%s%s\n", <arbitrary whitespace>, <method name>. + + The list is terminated by an empty line. Additional information for + human users is printed after the empty line. + + When "-l list" is specified the available location providers are + printed with the header "Available location providers:\n" followed by + the list in the format + + "%s%s\n", <arbitrary whitespace>, <provider name>. + + The list is terminated by an empty line. Additional information for + human users is printed after the empty line. + + When "-m method:help", "-l provider:help", or "-h" is specified help + information is printed on in unspecified format, intended only for + human users. + + When "-V" is specified, the used version of the program is printed to + the standard output in the format + + "%s %s\n", <implementation name>, <version number>. + + If "-v" is specified and the colour settings depend on the Sun's + elevation, the elevation thresholds are printed to the standard + output in the format + + "Solar elevations: day above %f, night below %f\n", + <minimum solar elevation at daytime>, + <maximum solar elevation at nighttime>. + + This line may be printed, if "-v" is specified, if redshift is + configured. + + If "-v" is specified and the colour settings depend on the clock time, + the time schedule is printed to the standard output, with the header + + These lines may be printed, if "-v" is specified, if redshift is + configured. + + If "-v" is specified, the colour settings is printed to the standard + output in the format + + "Temperatures: %luK at day, %luK at night\n" + "Brightness: %f:%f\n" + "Gamma (Daytime): %f, %f, %f\n" + "Gamma (Night): %f, %f, %f\n", + <daytime colour temperature>, <nighttime temperature>, + <daytime whitepoint brightness>, <nighttime brightness>, + <daytime red gamma>, <daytime green gamma>, + <daytime blue gamma>, <nighttime red gamma>, + <nighttime green gamma>, <nighttime blue gamma>. + + Each line may be printed, if "-v" is specified, if redshift is + configured. + + If the colour effects depend on the Sun's elevation, the user's + geographical location will printed to the standard output in the + format + + "Location: %f %c, %f %c\n", + fabs(<GPS latitude>), signbit(<GPS latitude>) ? 'S' : 'N', + fabs(<GPS longitude>), signbit(<GPS longitude>) ? 'W' : 'E'. + + This message is printed when the program starts and any time the + location is updated. + + If the colour effects are non-static, the current period of the day + (which determine the colour effects) is printed to standard output, + if "-v" or "-p" is specified, in the format + + "Period: %s\n", <period> + + where <period> is "None", "Daytime", or "Night", or in the format + + "Period: Transition (%f%% day)", <dayness level>. + + <dayness level> is exclusively between 0 (night) and 1 (daytime). + + This message is printed when the program starts and any time it + changes (if "-v" is specified). + + If "-v" or "-p" is specified, the colour settings are printed to the + standard output when the program standard and any time it changes + (fade effect is ignored). These are printed in three different + messages and, on chagne, only the settings that changed are printed: + + "Color temperature: %luK\n", <colour temperature>; + + "Brightness: %f\n", <whitepoint brightness level (0-1)>; + + "Gamma: %f, %f, %f\n", <red gamma>, <green gamma>, <blue gamma>. + + If the "dummy" gamma ramp adjustment method is used, any time a colour + change is applied (including each fade step), the colour temperature + is output, for debugging purposes (brightness and gamma are not printed), + to the standard output in the format + + "Temperature: %lu\n", <colour temperature>. STDERR Default. @@ -172,7 +350,7 @@ EXTENDED DESCRIPTION gamut, and thus incorrect even on sRGB monitors. EXIT STATUS - TODO + Default. EXAMPLES TODO @@ -228,6 +406,17 @@ KNOWN ISSUES applications that apply different effects. However coopgammad still has to compete with applications that does not use it. + DRM and display servers + Using the DRM gamma ramp adjustment method can block starting or + switching to and already started display server (like X). Users may + also find that trying to switch to and an already started display cases + the computer hang, or more precisely appear to hang, as the display + server is not beign presented, the screen freezes, and the keyboard + doesn't do anything. (Once upon a time, this wasn't as catastrophic, + and it probably depend on display server implementation details.) The + only solution, abort from restarting the computer, is to remote into + it and kill the display server. + RATIONALE To prevent the user from accidental making the screen black, brightness level below 0.1 are forbidden. @@ -15,7 +15,6 @@ https://github.com/jonls/redshift/pull/864 Fix apparmor config. https://github.com/jonls/redshift/issues/31 Change temperature from the icon https://github.com/jonls/redshift/issues/36 Fallback location provider -https://github.com/jonls/redshift/issues/51 Add support for "bedtime" mode https://github.com/jonls/redshift/issues/129 Feature: Adjust brightness on the fly using shortcuts or gui https://github.com/jonls/redshift/issues/138 Run as system service https://github.com/jonls/redshift/issues/150 Startup crash if no working DNS @@ -38,7 +37,6 @@ https://github.com/jonls/redshift/issues/248 changing temperature in manual mode https://github.com/jonls/redshift/issues/253 It doesn't kill the process after I logout. https://github.com/jonls/redshift/issues/254 Weird unstability issue https://github.com/jonls/redshift/issues/259 Redshift can be executed and run twice -https://github.com/jonls/redshift/issues/269 Ubuntu version consumes too much cpu https://github.com/jonls/redshift/issues/270 Disable smooth day and night transition in the config file not working https://github.com/jonls/redshift/issues/273 Unable to autostart redshift via services (Arch Linux) https://github.com/jonls/redshift/issues/286 Tray icon and checkmarks missing @@ -66,8 +64,6 @@ https://github.com/jonls/redshift/issues/424 Invoking redshift-gtk from terminal https://github.com/jonls/redshift/issues/436 Adjust backlight of external monitors https://github.com/jonls/redshift/issues/437 How to autostart redshift-gtk in a disabled state? https://github.com/jonls/redshift/issues/444 Redshift prevents computer from suspending automatically -https://github.com/jonls/redshift/issues/473 Can't configure Redshift with terminal -https://github.com/jonls/redshift/issues/495 Why are screens dimmed incrementally then enlightend back to initial brightness? https://github.com/jonls/redshift/issues/496 redshift=gtk coredump on logout https://github.com/jonls/redshift/issues/501 Icons Not Appearing On XFCE https://github.com/jonls/redshift/issues/516 redshift-gtk consumes 100% CPU if denied geoclue (or cannot find geoclue?) @@ -108,7 +104,6 @@ https://github.com/jonls/redshift/issues/737 Not working on external monitors (u https://github.com/jonls/redshift/issues/741 WINGDI not working with extend screen settings in win 10 version 1903 os build 18362.418 https://github.com/jonls/redshift/issues/745 Unknown location provider `geoclue' https://github.com/jonls/redshift/issues/746 Redshift restarts when switching to an i3 workspace with a java application -https://github.com/jonls/redshift/issues/747 How do i remove the day/time period colors and enable/disable redshift manual? https://github.com/jonls/redshift/issues/750 Supporting multiple time periods https://github.com/jonls/redshift/issues/756 Add a way to check whether redshift is currently enabled and add a way to disable/enable https://github.com/jonls/redshift/issues/758 failed (Result: start-limit-hit) @@ -132,15 +127,12 @@ https://github.com/jonls/redshift/issues/807 hooks are not executed on return fr https://github.com/jonls/redshift/issues/809 Allow to run without geoservices https://github.com/jonls/redshift/issues/810 With manually specified lat/long redshift toggles between day and night https://github.com/jonls/redshift/issues/813 Start Redshift on ubuntu HIRSUTE -https://github.com/jonls/redshift/issues/814 Improving configuration management (bachelor thesis) https://github.com/jonls/redshift/issues/815 Robustness improvement suggestion https://github.com/jonls/redshift/issues/816 Allow forcing of night mode or night color temperature https://github.com/jonls/redshift/issues/818 Multiple processes for Redshift are running in the background -https://github.com/jonls/redshift/issues/820 Redshift not reading the config file https://github.com/jonls/redshift/issues/822 redshift-gtk: tray icon/widget menu option: Reset, Force Day, Force Night https://github.com/jonls/redshift/issues/827 Three Stage shift https://github.com/jonls/redshift/issues/830 redshift Unable to start GeoClue client -https://github.com/jonls/redshift/issues/831 Redshift doesn't close https://github.com/jonls/redshift/issues/834 2 Redshift icons in the notification bar https://github.com/jonls/redshift/issues/839 Allow hooks to transition smoothly https://github.com/jonls/redshift/issues/841 Add intermediate temperature mode / value @@ -150,28 +142,22 @@ https://github.com/jonls/redshift/issues/848 installed from brew, does not work https://github.com/jonls/redshift/issues/849 Windows blinking / flickering of "classic" Windows menus https://github.com/jonls/redshift/issues/852 Redshift crashes when toggling inhibit while receiving the initial location https://github.com/jonls/redshift/issues/853 Add a status icon that signals that redshift-gtk is currently waiting for the initial location -https://github.com/jonls/redshift/issues/857 xbacklight: unrecognized argument '-list' -https://github.com/jonls/redshift/issues/859 Make Redshift ignore temp-day and preserve monitor settings during the day https://github.com/jonls/redshift/issues/862 (redshift-gtk:6420): Gdk-CRITICAL https://github.com/jonls/redshift/issues/863 randr value -1 error https://github.com/jonls/redshift/issues/868 [Feature Request] Separate Monitor Control https://github.com/jonls/redshift/issues/869 clarify documentation/configuration/sample to configure times better? https://github.com/jonls/redshift/issues/870 redshift-gtk doesn't read conf files at log-in -https://github.com/jonls/redshift/issues/877 symbolic link problem with configuration file https://github.com/jonls/redshift/issues/880 "Unable to set gamma ramps. Temperature adjustment failed." in win10 -https://github.com/jonls/redshift/issues/885 Toggle day and night modes in redshift https://github.com/jonls/redshift/issues/887 Error!!!, no more methods to try -https://github.com/jonls/redshift/issues/891 Is it working ? I can't tell. +https://github.com/jonls/redshift/issues/891 Is it working ? I can't tell.a https://github.com/jonls/redshift/issues/892 Show dusk/dawn times when hovering mouse over icon https://github.com/jonls/redshift/issues/895 Redshift GTK no longer connecting to location provider https://github.com/jonls/redshift/issues/898 Apparmor denies access to amdgpu binaries in default profile under Linux Mint 21.3 -https://github.com/jonls/redshift/issues/899 Its possible to set the day and night based on time instead geoloc.? like setting: day-time: 6:00 or 6:00AM https://github.com/jonls/redshift/issues/903 Proposal for location detection using speedtest-cli method https://bugs.launchpad.net/redshift/+bug/884408 Warn/fallback if calculated (latitude, longitude) is (0, 0) CONFIRMED ISSUES -[BUG] https://github.com/jonls/redshift/issues/854 Version 1.11 works, 1.12 broken [GTK] https://github.com/jonls/redshift/issues/256 Redshift with Bumblebee? UNCONFIRMED ISSUES @@ -184,13 +170,11 @@ https://github.com/jonls/redshift/issues/249 Feature request: intensity https://github.com/jonls/redshift/issues/867 Make Redshift remember the last discovered location at startup https://github.com/jonls/redshift/issues/199 Setting neutral color temperature? -Add +P for preserve_gamma=1 -Add +r for use_fade=1 +Add -H for hook file/directory po/sv.po: gammaförfining[ar] -> gammatabell[er]; lost -> förlorat {wrong gender} -> försvunnen; CRTC -> CRTC[:er] po/de.po: lost -> verloren -> verschwunden po/sv.po: felaktig -> ogiltig (?) po/sv.po: NBSP before units (after ° which should also be added) -Previously unmarked for NLS: redshift.c: "Unable to load config file." Optionally use METAR data adjust day-time colour temperature according the cloudiness -read the monitores chromas to determine it's colour space and correct the RGB multipliers according +read the monitor's chromas to determine it's colour space and correct the RGB multipliers according Use coordinates (zone1970.tab, be aware that the coordinates are store in degress and minutes, and sometimes also seconds, not degrees with decimals), for the user's timezone, from tzdata as a fallback @@ -100,16 +100,34 @@ program options are placed under the \fBredshift\fR header, while options for location providers and adjustment methods are placed under a header with the name of that provider or method. General options are: .TP +\fBtemp\fR = \fIday\fB:\fInight\fR +.TQ +\fBtemp\fR = \fIinteger\fR +.TQ +\fBtemperature\-day\fR = \fIday\fB:\fInight\fR +.TQ +\fBtemperature\-day\fR = \fIinteger\fR +Temperature (day and night) +.TP \fBtemp\-day\fR = \fIinteger\fR +.TQ +\fBtemperature\-day\fR = \fIinteger\fR Daytime temperature .TP \fBtemp\-night\fR = \fIinteger\fR +.TQ +\fBtemperature\-night\fR = \fIinteger\fR Night temperature .TP \fBfade\fR = \fI0 or 1\fR Disable or enable fading between color temperatures when Redshift starts or stops .TP +\fBbrightness\fR = \fIday\fB:\fInight\fR +.TQ +\fBbrightness\fR = \fI0.1\-1.0\fR +Screen brightness (day and night) +.TP \fBbrightness\-day\fR = \fI0.1\-1.0\fR Screen brightness at daytime .TP @@ -132,12 +150,20 @@ The custom time interval for the transition from day to night in the evening. When specified, the solar elevation will not be used to determine the current daytime/night period. If this option is set, dawn-time must also be specified. .TP +\fBgamma\fR = \fIday\fB:\fInight\fR +.TQ +\fBgamma\fR = \fI0.1\-10.0\fR +.TQ \fBgamma\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply (day and night) .TP +\fBgamma-day\fR = \fI0.1\-10.0\fR +.TQ \fBgamma-day\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply at daytime .TP +\fBgamma-night\fR = \fI0.1\-10.0\fR +.TQ \fBgamma-night\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply at night .TP diff --git a/src/common.h b/src/common.h index aa9af94..b50bb6a 100644 --- a/src/common.h +++ b/src/common.h @@ -368,6 +368,11 @@ enum program_mode { PROGRAM_MODE_ONE_SHOT, /** + * Update temperature once and reset when killed + */ + PROGRAM_MODE_UNTIL_DEATH, + + /** * Print setting and exit */ PROGRAM_MODE_PRINT, @@ -632,8 +637,8 @@ struct setting_time { }; struct settings { - /* Path to config file */ const char *config_file; + int until_death; struct config_ini_state config; @@ -1103,6 +1108,22 @@ void run_period_change_hooks(enum period prev_period, enum period period); */ void install_signal_handlers(void); +/** + * Install signal handlers for forcefully terminating + * the process + * + * This is useful if slave thread is blocked + * + * SIGINT, SIGTERM, and SIGQUIT are set to at the + * first arrival arm a SIGARLM timer with a short + * expiration time, and on the second arrival + * immediately terminate the process. SIGARLM is + * set to immediately terminate the process. + */ +#ifndef WINDOWS +void install_forceful_exit_signal_handlers(void); +#endif + /* util.c */ 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"), diff --git a/src/gamma-coopgamma.c b/src/gamma-coopgamma.c index 0dfb9c2..6f9edb7 100644 --- a/src/gamma-coopgamma.c +++ b/src/gamma-coopgamma.c @@ -172,6 +172,7 @@ coopgamma_start(struct gamma_state *state) lifespan = LIBCOOPGAMMA_UNTIL_REMOVAL; break; case PROGRAM_MODE_CONTINUAL: + case PROGRAM_MODE_UNTIL_DEATH: lifespan = LIBCOOPGAMMA_UNTIL_DEATH; break; default: diff --git a/src/location-geoclue2.c b/src/location-geoclue2.c index 69323c2..ced6eb8 100644 --- a/src/location-geoclue2.c +++ b/src/location-geoclue2.c @@ -386,7 +386,8 @@ geoclue2_free(struct location_state *state) if (state->pipe_fd_read >= 0) close(state->pipe_fd_read); - /* Closing the pipe should cause the thread to exit */ + /* Closing the pipe should cause the thread to exit, but it may be blocked by I/O */ + install_forceful_exit_signal_handlers(); g_thread_join(state->thread); state->thread = NULL; diff --git a/src/location.c b/src/location.c index a70be8c..bd852a1 100644 --- a/src/location.c +++ b/src/location.c @@ -168,7 +168,10 @@ get_location(const struct location_provider *provider, LOCATION_STATE *state, in if (provider->fetch(state, location_out, &available) < 0) return -1; - } while (!available); + } while (!available && !exiting); + + if (exiting) + eprintf(_("Terminated by user.")); return 1; #endif diff --git a/src/redshift.c b/src/redshift.c index 4f2304c..ddab891 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -304,11 +304,11 @@ run_continual_mode(void) disable = 0; } if (exiting) { - if (done) /* TODO also if already disabled (fade complete) */ - break; /* On second signal stop the ongoing fade */ - done = 1; disabled = 1; exiting = 0; + if (done || (disabled && !fade_length)) + break; /* On second signal stop the ongoing fade */ + done = 1; } if (verbose && disabled != prev_disabled) printf(_("Status: %s\n"), disabled ? _("Disabled") : _("Enabled")); @@ -358,7 +358,7 @@ run_continual_mode(void) prev_target_colour = target_colour; /* Break loop when done and final fade is over */ - if (done && fade_length == 0) + if (done && !fade_length) break; /* Adjust temperature and sleep */ @@ -386,6 +386,9 @@ main(int argc, char *argv[]) double day_level; enum period period; struct colour_setting colour; +#ifndef WINDOWS + int fd; +#endif argv0 = argv[0]; @@ -397,6 +400,21 @@ main(int argc, char *argv[]) textdomain(PACKAGE); #endif + /* Ensure standard file descriptors exist */ +#ifndef WINDOWS + fd = open("/dev/null", O_RDWR); + while (fd < 2) { + if (fd < 0) + eprintf("open /dev/null O_RDWR:"); + fd = dup(fd); + } + if (fd > 2) + close(fd); +#endif + + /* Set up interprocess communication */ + install_signal_handlers(); + /* Get configurations and configure */ load_settings(&settings, argc, argv); if (scheme.type == SOLAR_SCHEME) { @@ -409,9 +427,6 @@ main(int argc, char *argv[]) } config_ini_free(&settings.config); - /* Set up interprocess communication */ - install_signal_handlers(); - /* Get location if required */ if (scheme.type == SOLAR_SCHEME) { if (provider->get_fd(provider_state) >= 0) @@ -441,10 +456,11 @@ main(int argc, char *argv[]) break; case PROGRAM_MODE_ONE_SHOT: + case PROGRAM_MODE_UNTIL_DEATH: case PROGRAM_MODE_RESET: if (method->apply(method_state, &colour, preserve_gamma) < 0) eprintf(_("Temperature adjustment failed.")); - if (method->autoreset) { + if (mode == PROGRAM_MODE_UNTIL_DEATH || method->autoreset) { weprintf(_("Press ctrl-c to stop...")); while (!exiting) pause(); @@ -461,9 +477,9 @@ main(int argc, char *argv[]) #endif } - if (method_state) - method->free(method_state); if (provider_state) provider->free(provider_state); + if (method_state) + method->free(method_state); return 0; } diff --git a/src/signals.c b/src/signals.c index 3487d23..390d684 100644 --- a/src/signals.c +++ b/src/signals.c @@ -25,8 +25,8 @@ volatile sig_atomic_t disable = 0; /** - * Signal handlar for exit signals (SIGINT, SIGTERM, SIGQUIT) - * + * Signal handler for exit signals (SIGINT, SIGTERM, SIGQUIT) + * * @param signo The received signal */ static void @@ -41,8 +41,8 @@ sigexit(int signo) /** - * Signal handlar for disable signal (SIGUSR1) - * + * Signal handler for disable signal (SIGUSR1) + * * @param signo The received signal */ #ifndef WINDOWS @@ -55,6 +55,24 @@ sigdisable(int signo) #endif +/** + * Signal handler for forceful exiting; installed by + * `install_forceful_exit_signal_handlers` + * + * @param signo The received signal + */ +#ifndef WINDOWS +static void +sigalrm(int signo) +{ + if (exiting || signo == SIGALRM) + exit(0); + exiting = 1; + alarm(1U); +} +#endif + + void install_signal_handlers(void) { @@ -90,3 +108,28 @@ install_signal_handlers(void) eprintf("sigaction SIGCHLD &{.sa_handler=SIG_IGN, .sa_mask={}, .sa_flags=0} NULL:"); #endif } + + +#ifndef WINDOWS +void +install_forceful_exit_signal_handlers(void) +{ + struct sigaction sigact; + sigset_t sigset; + + exiting = 0; + memset(&sigact, 0, sizeof(sigact)); + sigemptyset(&sigset); + sigact.sa_mask = sigset; + sigact.sa_flags = 0; + sigact.sa_handler = &sigalrm; + if (sigaction(SIGINT, &sigact, NULL)) + eprintf("sigaction SIGINT &{.sa_handler=<function pointer>, .sa_mask={}, .sa_flags=0} NULL:"); + if (sigaction(SIGTERM, &sigact, NULL)) + eprintf("sigaction SIGTERM &{.sa_handler=<function pointer>, .sa_mask={}, .sa_flags=0} NULL:"); + if (sigaction(SIGQUIT, &sigact, NULL)) + eprintf("sigaction SIGQUIT &{.sa_handler=<function pointer>, .sa_mask={}, .sa_flags=0} NULL:"); + if (sigaction(SIGALRM, &sigact, NULL)) + eprintf("sigaction SIGALRM &{.sa_handler=<function pointer>, .sa_mask={}, .sa_flags=0} NULL:"); +} +#endif @@ -271,9 +271,6 @@ vweprintf(const char *fmt, va_list args) { int saved_errno; const char *errstrprefix, *errstr; -#if !defined(WINDOWS) - int locked; -#endif saved_errno = errno; if (!*fmt) { @@ -289,19 +286,12 @@ vweprintf(const char *fmt, va_list args) errstrprefix = ""; errstr = ""; } -#if !defined(WINDOWS) - locked = !flock(STDERR_FILENO, LOCK_EX); -#endif fprintf(stderr, "%s: ", argv0); vfprintf(stderr, fmt, args); if (errstr) fprintf(stderr, "%s%s\n", errstrprefix, errstr); -#if !defined(WINDOWS) - if (locked) - flock(STDERR_FILENO, LOCK_UN); -#endif errno = saved_errno; } |