Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

xdg-shell: fix inert xdg_surface handling #1964

Merged
merged 2 commits into from
Dec 30, 2019
Merged

xdg-shell: fix inert xdg_surface handling #1964

merged 2 commits into from
Dec 30, 2019

Conversation

emersion
Copy link
Member

@emersion emersion commented Dec 24, 2019 •
edited

Closes: swaywm/sway#4834
Closes: #1890

This was referenced Dec 24, 2019
Closed
Closed
@ammen99
Copy link
Member

ammen99 commented Dec 29, 2019

It is worth mentioning that this patch makes all applications that use gtk-layer-shell crash as soon as I try to open a popup. This happens in both Sway and Wayfire, with gtk-layer-demo, mate-panel and wf-panel. Popups of native GTK apps work.

@ammen99
Copy link
Member

ammen99 commented Dec 29, 2019

Oh, and without these patches, with mate-panel's popups, I can trigger an assertion inside wlroots (on Wayfire). So there is something fishy here.

@emersion
Copy link
Member Author

Ah, indeed, I was rejecting a NULL parent arg in the get_popup handler, which layer-shell relies on. Can you try this updated version?

@emersion
xdg-shell: make wlr_xdg_surface_from_resource reject NULL
99ee754 
Most resources must not be NULL. Make it so callers need to check for
NULL explicitly. This makes it clearer in the handlers code that the
NULL wl_resource case needs to be handled, and allows callers to make a
difference between a NULL wl_resource and an inert resource.
@ammen99
Copy link
Member

ammen99 commented Dec 29, 2019

@emersion Yes, it seems to work now.

@ddevault
Copy link
Contributor

Thanks!

@ddevault ddevault merged commit 8bb2dc6 into swaywm:master Dec 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ddevault ddevault ddevault approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
3 participants
@emersion @ammen99 @ddevault