From 3ae21aa9a31abdef211d36c025ba26752452c2f8 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Tue, 18 Aug 2020 02:28:01 +0100 Subject: [PATCH] config: rename shadow-hex to shadow-color It's not directly clear from the name "shadow-hex" that it's related to color. Signed-off-by: Yuxuan Shui --- man/picom.1.asciidoc | 6 +++--- picom.sample.conf | 2 +- src/config.c | 2 +- src/config.h | 2 +- src/config_libconfig.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/man/picom.1.asciidoc b/man/picom.1.asciidoc index da386094..3d50f489 100644 --- a/man/picom.1.asciidoc +++ b/man/picom.1.asciidoc @@ -88,6 +88,9 @@ OPTIONS *--write-pid-path* 'PATH':: Write process ID to a file. +*--shadow-color* 'STRING':: + Color of shadow, as a hex string ('#000000') + *--shadow-red* 'VALUE':: Red color value of shadow (0.0 - 1.0, defaults to 0). @@ -151,9 +154,6 @@ OPTIONS *--shadow-exclude* 'CONDITION':: Specify a list of conditions of windows that should have no shadow. -*--shadow-hex* 'STRING':: - Color of shadow using hex string ('#000000') - *--fade-exclude* 'CONDITION':: Specify a list of conditions of windows that should not be faded. diff --git a/picom.sample.conf b/picom.sample.conf index fd888a28..420a3cfb 100644 --- a/picom.sample.conf +++ b/picom.sample.conf @@ -45,7 +45,7 @@ shadow-offset-y = -7; # shadow-blue = 0 # Hex string color value of shadow (#000000 - #FFFFFF, defaults to #000000). This option will override options set shadow-(red/green/blue) -# shadow-hex = "#000000" +# shadow-color = "#000000" # Do not paint shadows on shaped windows. Note shaped windows # here means windows setting its shape through X Shape extension. diff --git a/src/config.c b/src/config.c index df3b2c83..3fd0c4d2 100644 --- a/src/config.c +++ b/src/config.c @@ -515,7 +515,7 @@ char *parse_config(options_t *opt, const char *config_file, bool *shadow_enable, .sw_opti = false, .use_damage = true, - .shadow_hex = "#000000", + .shadow_color = "#000000", .shadow_red = 0.0, .shadow_green = 0.0, .shadow_blue = 0.0, diff --git a/src/config.h b/src/config.h index 831f550f..c6068ed0 100644 --- a/src/config.h +++ b/src/config.h @@ -140,7 +140,7 @@ typedef struct options { // === Shadow === /// Red, green and blue tone of the shadow. double shadow_red, shadow_green, shadow_blue; - char *shadow_hex; + char *shadow_color; int shadow_radius; int shadow_offset_x, shadow_offset_y; double shadow_opacity; diff --git a/src/config_libconfig.c b/src/config_libconfig.c index 929c31f6..43011bc0 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -425,8 +425,8 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad config_lookup_float(&cfg, "shadow-green", &opt->shadow_green); // --shadow-blue config_lookup_float(&cfg, "shadow-blue", &opt->shadow_blue); - // --shadow-hex - if (config_lookup_string(&cfg, "shadow-hex", &sval)) { + // --shadow-color + if (config_lookup_string(&cfg, "shadow-color", &sval)) { struct color rgb; rgb = hex_to_rgb(sval); opt->shadow_red = rgb.red;