BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: remove deprecation message for glx-use-copysubbuffermesa and glx-copy-from-front 

Deprecated since v3, removed since v6

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2020-04-11 16:08:04 +01:00
parent 9767b4da5a
commit 6d86d50213
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config_libconfig.c
View File

@ -604,17 +604,9 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad
goto err; goto err;
} }
const char *deprecation_message = const char *deprecation_message attr_unused =
"has been removed. If you encounter problems " "has been removed. If you encounter problems "
"without this feature, please feel free to open a bug report"; "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);
goto err;
}
if (lcfg_lookup_bool(&cfg, "glx-copy-from-front", &bval) && bval) {
log_error("\"glx-copy-from-front\" %s", deprecation_message);
goto err;
}
config_setting_t *blur_cfg = config_lookup(&cfg, "blur"); config_setting_t *blur_cfg = config_lookup(&cfg, "blur");
if (blur_cfg) { if (blur_cfg) {

17
src/options.c
View File

@ -398,10 +398,8 @@ static const struct option longopts[] = {
{"opengl", no_argument, NULL, 289}, {"opengl", no_argument, NULL, 289},
{"backend", required_argument, NULL, 290}, {"backend", required_argument, NULL, 290},
{"glx-no-stencil", no_argument, NULL, 291}, {"glx-no-stencil", no_argument, NULL, 291},
{"glx-copy-from-front", no_argument, NULL, 292},
{"benchmark", required_argument, NULL, 293}, {"benchmark", required_argument, NULL, 293},
{"benchmark-wid", required_argument, NULL, 294}, {"benchmark-wid", required_argument, NULL, 294},
{"glx-use-copysubbuffermesa", no_argument, NULL, 295},
{"blur-background-exclude", required_argument, NULL, 296}, {"blur-background-exclude", required_argument, NULL, 296},
{"active-opacity", required_argument, NULL, 297}, {"active-opacity", required_argument, NULL, 297},
{"glx-no-rebind-pixmap", no_argument, NULL, 298}, {"glx-no-rebind-pixmap", no_argument, NULL, 298},
@ -518,9 +516,10 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
// Parse commandline arguments. Range checking will be done later. // Parse commandline arguments. Range checking will be done later.
const char *deprecation_message = "has been removed. If you encounter problems " const char *deprecation_message attr_unused =
"without this feature, please feel free to " "has been removed. If you encounter problems "
"open a bug report."; "without this feature, please feel free to "
"open a bug report.";
optind = 1; optind = 1;
while (-1 != (o = getopt_long(argc, argv, shortopts, longopts, &longopt_idx))) { while (-1 != (o = getopt_long(argc, argv, shortopts, longopts, &longopt_idx))) {
switch (o) { switch (o) {
@ -705,19 +704,11 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
exit(1); exit(1);
break; break;
P_CASEBOOL(291, glx_no_stencil); P_CASEBOOL(291, glx_no_stencil);
case 292:
log_error("--glx-copy-from-front %s", deprecation_message);
exit(1);
break;
P_CASEINT(293, benchmark); P_CASEINT(293, benchmark);
case 294: case 294:
// --benchmark-wid // --benchmark-wid
opt->benchmark_wid = (xcb_window_t)strtol(optarg, NULL, 0); opt->benchmark_wid = (xcb_window_t)strtol(optarg, NULL, 0);
break; break;
case 295:
log_error("--glx-use-copysubbuffermesa %s", deprecation_message);
exit(1);
break;
case 296: case 296:
// --blur-background-exclude // --blur-background-exclude
condlst_add(&opt->blur_background_blacklist, optarg); condlst_add(&opt->blur_background_blacklist, optarg);