Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated options for v11 #1162

Merged
merged 4 commits into from
Jan 15, 2024
Merged

Remove deprecated options for v11 #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d4eaec
options: remove -F
yshui Jan 14, 2024
5e11912
options: use of sw-opti is now an error
yshui Jan 14, 2024
dc2d7b2
options: use of respect-prop-shadow is now an error
yshui Jan 14, 2024
30e37db
Update CHANGELOG.md
yshui Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions man/picom.1.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion src/config_libconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@
}
// --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;

Check warning on line 482 in src/config_libconfig.c

View check run for this annotation

Codecov / codecov/patch

src/config_libconfig.c#L481-L482 

Added lines #L481 - L482 were not covered by tests
}
// --use-ewmh-active-win
lcfg_lookup_bool(&cfg, "use-ewmh-active-win", &opt->use_ewmh_active_win);
Expand Down
9 changes: 5 additions & 4 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
}
}

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
Expand Down Expand Up @@ -426,7 +426,6 @@
opt->wintype_option[WINTYPE_DROPDOWN_MENU].opacity = tmp;
break;
case 'f':
case 'F':
fading_enable = true;
break;
P_CASEINT('r', shadow_radius);
Expand Down Expand Up @@ -511,8 +510,9 @@
"--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 "

Check warning on line 513 in src/options.c

View check run for this annotation

Codecov / codecov/patch

src/options.c#L513 

Added line #L513 was not covered by tests
"command line options");
failed = true;

Check warning on line 515 in src/options.c

View check run for this annotation

Codecov / codecov/patch

src/options.c#L515 

Added line #L515 was not covered by tests
break;
case 275:
// --vsync-aggressive
Expand All @@ -523,9 +523,10 @@
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 "

Check warning on line 526 in src/options.c

View check run for this annotation

Codecov / codecov/patch

src/options.c#L526 

Added line #L526 was not covered by tests
"functionality will always be enabled. Please remove it "
"from the command line options");
failed = true;

Check warning on line 529 in src/options.c

View check run for this annotation

Codecov / codecov/patch

src/options.c#L529 

Added line #L529 was not covered by tests
break;
P_CASEBOOL(278, unredir_if_possible);
case 279:
Expand Down
Loading