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

Add 'animation-exclude' to command line options (picom_options[]) #41

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open

Add 'animation-exclude' to command line options (picom_options[]) #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79a1132
Add 'animation-exclude' to command line options (picom_options[])
Jul 13, 2024
bfe3bd6
Add missing animation command line options
Jul 13, 2024
16e590d
Fix dwm 'tag change' conditions
Jul 13, 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
34 changes: 34 additions & 0 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ static const struct picom_option picom_options[] = {
{"animation-clamping" , no_argument , 809, NULL , "Enable/disable animation clamping. Disabling increases performance"},
{"animation-for-open-window" , required_argument, 810, NULL , "Set animation for opening window (Check sample.conf for options)."},
{"animation-for-transient-window", required_argument, 811, NULL , "Set animation for transient (child) windows."},
{"animation-for-unmap-window" , required_argument, 812, NULL , "Set animation for unmap window (Check sample.conf for options)."},
{"animation-for-next-tag" , required_argument, 813, NULL , "Set animation for next tag (Check sample.conf for options)."},
{"animation-for-prev-tag" , required_argument, 814, NULL , "Set animation for previous tag (Check sample.conf for options)."},
{"animation-exclude" , required_argument, 820, NULL , "Specify a list of conditions of windows that should never be animated."},

};
// clang-format on
Expand Down Expand Up @@ -802,6 +806,36 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
break;
}
case 812: {
// --animation-for-unmap-window
enum open_window_animation animation = parse_open_window_animation(optarg);
if (animation >= OPEN_WINDOW_ANIMATION_INVALID) {
log_warn("Invalid unmap-window animation %s, ignoring.", optarg);
} else {
opt->animation_for_unmap_window = animation;
}
break;
}
case 813: {
// --animation-for-next-tag
enum open_window_animation animation = parse_open_window_animation(optarg);
if (animation >= OPEN_WINDOW_ANIMATION_INVALID) {
log_warn("Invalid next-tag animation %s, ignoring.", optarg);
} else {
opt->animation_for_next_tag = animation;
}
break;
}
case 814: {
// --animation-for-prev-tag
enum open_window_animation animation = parse_open_window_animation(optarg);
if (animation >= OPEN_WINDOW_ANIMATION_INVALID) {
log_warn("Invalid prev-tag animation %s, ignoring.", optarg);
} else {
opt->animation_for_prev_tag = animation;
}
break;
}
case 820: {
// --animation-exclude
condlst_add(&opt->animation_blacklist, optarg);
break;
Expand Down
6 changes: 4 additions & 2 deletions src/win.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,9 +696,11 @@ void win_process_update_flags(session_t *ps, struct managed_win *w) {

// Determine if a window should animate
if (win_should_animate(ps, w)) {
if (w->pending_g.y < 0 && w->g.y > 0 && abs(w->pending_g.y - w->g.y) >= w->pending_g.height)
if ((w->pending_g.y < 0 && w->g.y > 0 && abs(w->pending_g.y - w->g.y) >= w->pending_g.height) ||
(w->pending_g.x < 0 && w->g.x > 0 && abs(w->pending_g.x - w->g.x) >= w->pending_g.width))
w->dwm_mask = ANIM_PREV_TAG;
else if (w->pending_g.y > 0 && w->g.y < 0 && abs(w->pending_g.y - w->g.y) >= w->pending_g.height)
else if ((w->pending_g.y > 0 && w->g.y < 0 && abs(w->pending_g.y - w->g.y) >= w->pending_g.height) ||
(w->pending_g.x > 0 && w->g.x < 0 && abs(w->pending_g.x - w->g.x) >= w->pending_g.width))
w->dwm_mask = ANIM_NEXT_TAG;

if (!was_visible || w->dwm_mask) {
Expand Down