From 17d128159486f37079e7c85206e577fdc2142e9f Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Mon, 11 Mar 2019 23:53:21 +0000 Subject: [PATCH] Remove options deprecated in v3 Specifically, use --glx-copy-from-front and --glx-use-copysubbuffermesa are now hard errors. Signed-off-by: Yuxuan Shui --- src/config_libconfig.c | 12 ++++++++---- src/options.c | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/config_libconfig.c b/src/config_libconfig.c index d4df3ad..0c1c773 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -414,10 +414,14 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad 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_warn("\"glx-use-copysubbuffermesa\" %s", deprecation_message); - if (lcfg_lookup_bool(&cfg, "glx-copy-from-front", &bval) && bval) - log_warn("\"glx-copy-from-front\" %s", deprecation_message); + if (lcfg_lookup_bool(&cfg, "glx-use-copysubbuffermesa", &bval) && bval) { + log_error("\"glx-use-copysubbuffermesa\" %s", deprecation_message); + return ERR_PTR(-1); + } + if (lcfg_lookup_bool(&cfg, "glx-copy-from-front", &bval) && bval) { + log_error("\"glx-copy-from-front\" %s", deprecation_message); + return ERR_PTR(-1); + } // Wintype settings diff --git a/src/options.c b/src/options.c index dd7a188..9509847 100644 --- a/src/options.c +++ b/src/options.c @@ -655,7 +655,8 @@ void get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, break; P_CASEBOOL(291, glx_no_stencil); case 292: - log_warn("--glx-copy-from-front %s", deprecation_message); + log_error("--glx-copy-from-front %s", deprecation_message); + exit(1); break; P_CASELONG(293, benchmark); case 294: @@ -663,7 +664,8 @@ void get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, opt->benchmark_wid = strtol(optarg, NULL, 0); break; case 295: - log_warn("--glx-use-copysubbuffermesa %s", deprecation_message); + log_error("--glx-use-copysubbuffermesa %s", deprecation_message); + exit(1); break; case 296: // --blur-background-exclude