From e075444663c854fde18f8d20c1bececc96a5c4ff Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Fri, 13 Oct 2017 19:08:55 -0700 Subject: Change preserve option to command line switch Changes each adjustment method to take a preserve parameter when setting the temperature instead of parsing the preserve option from the command line/configuration file. This helps resolve the issues around #513: - This allows the preserve option to be implemented as a command-line switch (-P). This switch _disables_ the preservation of existing gamma ramps. Having a command-line switch makes it easier to use directly with manual or one-shot mode. - The preserve options is on by default, so continual mode as well as other modes will default to applying the color adjustment on top of the current gamma ramps. - Preserve is always disabled in reset mode so resetting works as expected again. --- src/options.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/options.c') diff --git a/src/options.c b/src/options.c index 8a0a0d2..29eb706 100644 --- a/src/options.c +++ b/src/options.c @@ -189,6 +189,8 @@ print_help(const char *program_name) " color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" + " -P\t\tReset existing gamma ramps before applying new" + " color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" " -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n"), @@ -318,6 +320,7 @@ options_init(options_t *options) options->provider_args = NULL; options->use_fade = -1; + options->preserve_gamma = 1; options->mode = PROGRAM_MODE_CONTINUAL; options->verbose = 0; } @@ -334,7 +337,7 @@ options_parse_args( /* Parse command line arguments. */ int opt; - while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:prt:vVx")) != -1) { + while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:pPrt:vVx")) != -1) { switch (opt) { case 'b': parse_brightness_string( @@ -455,6 +458,9 @@ options_parse_args( case 'p': options->mode = PROGRAM_MODE_PRINT; break; + case 'P': + options->preserve_gamma = 0; + break; case 'r': options->use_fade = 0; break; -- cgit v1.2.3-70-g09d2