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.

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

layer-shell: fix commit handler #6551

Merged
merged 1 commit into from
Sep 25, 2021

Conversation

vyivel
Copy link
Contributor

@vyivel vyivel commented Sep 24, 2021

This commit makes sure the extents are kept up-to-date, fixes not
damaging the surface if its layer shell-specific state didn't change,
and adds a check if the layer shell-specific state didn't change but the
surface got mapped/unmapped, which could affect keyboard focus.


Fixes #6552

@vyivel vyivel marked this pull request as draft September 24, 2021 18:39
@vyivel vyivel marked this pull request as ready for review September 24, 2021 18:59
@vyivel vyivel force-pushed the layer-surface-fix-commit-handler branch from a284642 to 6eeb47e Compare September 24, 2021 19:12
Copy link
Member

@rpigott rpigott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kinda curious if moving the extent update to the commit handler has any effect on #6523.

Either way this change LGTM.

@vyivel
Copy link
Contributor Author

vyivel commented Sep 25, 2021

A user has reported that wofi doesn't get input focus immediately on start with this PR, so that needs to be looked into first before merging this.

This commit makes sure the extents are kept up-to-date, fixes not
damaging the surface if its layer shell-specific state didn't change,
and adds a check if the layer shell-specific state didn't change but the
surface got mapped/unmapped, which could affect keyboard focus.
@vyivel vyivel force-pushed the layer-surface-fix-commit-handler branch from 6eeb47e to 48d3974 Compare September 25, 2021 09:24
@vyivel
Copy link
Contributor Author

vyivel commented Sep 25, 2021

This should work now; tested with swaybg, swaybar, gtk-layer-demo and bemenu.

@vyivel vyivel requested a review from rpigott September 25, 2021 09:35
Copy link
Member

@rpigott rpigott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right. On the commit where the client becomes mapped the client may not have committed any actual layer-shell state. Makes sense and LGTM... again.

@vyivel vyivel merged commit 5fd5d64 into swaywm:master Sep 25, 2021
@vyivel vyivel deleted the layer-surface-fix-commit-handler branch September 26, 2021 04:24
emersion referenced this pull request Sep 28, 2021
This avoids infinite configure-ack_configure-commit loop.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

sway prevents key input to bemenu
2 participants