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

Remove options deprecated in v3 

Specifically, use --glx-copy-from-front and --glx-use-copysubbuffermesa
are now hard errors.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-03-11 23:53:21 +00:00
parent d39d937566
commit 17d1281594
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config_libconfig.c
View File

@ -414,10 +414,14 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad
const char *deprecation_message = const char *deprecation_message =
"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) if (lcfg_lookup_bool(&cfg, "glx-use-copysubbuffermesa", &bval) && bval) {
log_warn("\"glx-use-copysubbuffermesa\" %s", deprecation_message); log_error("\"glx-use-copysubbuffermesa\" %s", deprecation_message);
if (lcfg_lookup_bool(&cfg, "glx-copy-from-front", &bval) && bval) return ERR_PTR(-1);
log_warn("\"glx-copy-from-front\" %s", deprecation_message); }
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 // Wintype settings

6
src/options.c
View File

@ -655,7 +655,8 @@ void get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
break; break;
P_CASEBOOL(291, glx_no_stencil); P_CASEBOOL(291, glx_no_stencil);
case 292: case 292:
log_warn("--glx-copy-from-front %s", deprecation_message); log_error("--glx-copy-from-front %s", deprecation_message);
exit(1);
break; break;
P_CASELONG(293, benchmark); P_CASELONG(293, benchmark);
case 294: 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); opt->benchmark_wid = strtol(optarg, NULL, 0);
break; break;
case 295: case 295:
log_warn("--glx-use-copysubbuffermesa %s", deprecation_message); log_error("--glx-use-copysubbuffermesa %s", deprecation_message);
exit(1);
break; break;
case 296: case 296:
// --blur-background-exclude // --blur-background-exclude