From 6828f2445402ff80cd7d23b0e6c0697b714e33aa Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sat, 11 Apr 2020 15:55:56 +0100 Subject: [PATCH] config: remove the alpha-step option Deprecated since v5 Signed-off-by: Yuxuan Shui --- src/config_libconfig.c | 12 +++++++----- src/options.c | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/config_libconfig.c b/src/config_libconfig.c index fc43fb6..68c85ad 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -598,20 +598,22 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad log_warn("\"paint-on-overlay\" has been removed as an option, and " "is enabled whenever possible"); - if (config_lookup_float(&cfg, "alpha-step", &dval)) - log_warn("\"alpha-step\" has been removed, compton now tries to make use" - " of all alpha values"); + if (config_lookup_float(&cfg, "alpha-step", &dval)) { + log_error("\"alpha-step\" has been removed, compton now tries to make use" + " of all alpha values"); + goto err; + } const char *deprecation_message = "has been removed. If you encounter problems " "without this feature, please feel free to open a bug report"; if (lcfg_lookup_bool(&cfg, "glx-use-copysubbuffermesa", &bval) && bval) { log_error("\"glx-use-copysubbuffermesa\" %s", deprecation_message); - return ERR_PTR(-1); + goto err; } if (lcfg_lookup_bool(&cfg, "glx-copy-from-front", &bval) && bval) { log_error("\"glx-copy-from-front\" %s", deprecation_message); - return ERR_PTR(-1); + goto err; } config_setting_t *blur_cfg = config_lookup(&cfg, "blur"); diff --git a/src/options.c b/src/options.c index 8f44b43..4e40f35 100644 --- a/src/options.c +++ b/src/options.c @@ -642,9 +642,9 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, break; case 271: // --alpha-step - log_warn("--alpha-step has been removed, we now tries to " + log_error("--alpha-step has been removed, we now tries to " "make use of all alpha values"); - break; + return false; case 272: log_warn("use of --dbe is deprecated"); break; case 273: log_warn("--paint-on-overlay has been removed, and is enabled "