From 6d4eaec81119fd1f948ab14ee6007087c65e6e31 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sun, 14 Jan 2024 16:55:33 +0000 Subject: [PATCH 1/4] options: remove -F Deprecated in compton, in distant history. Signed-off-by: Yuxuan Shui --- man/picom.1.asciidoc | 3 --- src/options.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/man/picom.1.asciidoc b/man/picom.1.asciidoc index dbd3ec69..b5df2a78 100644 --- a/man/picom.1.asciidoc +++ b/man/picom.1.asciidoc @@ -49,9 +49,6 @@ OPTIONS *-f*, *--fading*:: Fade windows in/out when opening/closing and when opacity changes, unless *--no-fading-openclose* is used. -*-F*:: - Equals to *-f*. Deprecated. - *-i*, *--inactive-opacity*='OPACITY':: Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) diff --git a/src/options.c b/src/options.c index 834b66f0..fecf06ac 100644 --- a/src/options.c +++ b/src/options.c @@ -306,7 +306,7 @@ static void usage(const char *argv0, int ret) { } } -static const char *shortopts = "D:I:O:r:o:m:l:t:i:e:hscnfFCazGb"; +static const char *shortopts = "D:I:O:r:o:m:l:t:i:e:hscnfCazGb"; /// Get config options that are needed to parse the rest of the options /// Return true if we should quit @@ -426,7 +426,6 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, opt->wintype_option[WINTYPE_DROPDOWN_MENU].opacity = tmp; break; case 'f': - case 'F': fading_enable = true; break; P_CASEINT('r', shadow_radius); From 5e119123a7766e1ac49a0e12ab511984da73a63e Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sun, 14 Jan 2024 17:04:03 +0000 Subject: [PATCH 2/4] options: use of sw-opti is now an error Deprecated in v6, we forgot to remove it. Signed-off-by: Yuxuan Shui --- src/config_libconfig.c | 3 ++- src/options.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config_libconfig.c b/src/config_libconfig.c index ed2097eb..4dc15a1f 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -478,7 +478,8 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad } // --sw-opti if (lcfg_lookup_bool(&cfg, "sw-opti", &bval)) { - log_warn("The sw-opti %s", deprecation_message); + log_error("The sw-opti %s", deprecation_message); + goto err; } // --use-ewmh-active-win lcfg_lookup_bool(&cfg, "use-ewmh-active-win", &opt->use_ewmh_active_win); diff --git a/src/options.c b/src/options.c index fecf06ac..5bba15ff 100644 --- a/src/options.c +++ b/src/options.c @@ -510,8 +510,9 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, "--crop-shadow-to-monitor instead."); break; case 274: - log_warn("--sw-opti has been deprecated, please remove it from the " + log_error("--sw-opti has been deprecated, please remove it from the " "command line options"); + failed = true; break; case 275: // --vsync-aggressive From dc2d7b287607c8eb9c1158ee9cbbedc61d29e958 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sun, 14 Jan 2024 17:06:34 +0000 Subject: [PATCH 3/4] options: use of respect-prop-shadow is now an error Deprecated in v8. Signed-off-by: Yuxuan Shui --- src/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/options.c b/src/options.c index 5bba15ff..36378568 100644 --- a/src/options.c +++ b/src/options.c @@ -523,9 +523,10 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, P_CASEBOOL(276, use_ewmh_active_win); case 277: // --respect-prop-shadow - log_warn("--respect-prop-shadow option has been deprecated, its " + log_error("--respect-prop-shadow option has been deprecated, its " "functionality will always be enabled. Please remove it " "from the command line options"); + failed = true; break; P_CASEBOOL(278, unredir_if_possible); case 279: From 30e37dbf09043fe49ca1510d48b46cc9ab884ce6 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sun, 14 Jan 2024 17:10:20 +0000 Subject: [PATCH 4/4] Update CHANGELOG.md Signed-off-by: Yuxuan Shui --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f8a7df..255a811f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Unreleased + +## Deprecations + +* Uses of `--sw-opti`, and `--respect-prop-shadow` are now hard errors. +* `-F` has been removed completely. It was deprecated before the picom fork. + # v11-rc1 (2024-Jan-14) ## Notable features