mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 01:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop/xwayland: correctly handle association on o-r change

Browse source 
When override-redirect changes, we need to setup/teardown listeners,
just like we do for map.

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3773
This commit is contained in:
Simon Ser 2023-12-05 17:04:12 +01:00 committed by Kirill Primak
parent ae3acf26f8
commit bf2b79b284
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/desktop/xwayland.c
View file

@ -170,6 +170,7 @@ static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
} }
static void handle_map(struct wl_listener *listener, void *data); static void handle_map(struct wl_listener *listener, void *data);
static void handle_associate(struct wl_listener *listener, void *data);
struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsurface); struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsurface);
@ -178,14 +179,22 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi
wl_container_of(listener, surface, override_redirect); wl_container_of(listener, surface, override_redirect);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
bool mapped = xsurface->surface != NULL && xsurface->surface->mapped; bool associated = xsurface->surface != NULL;
bool mapped = associated && xsurface->surface->mapped;
if (mapped) { if (mapped) {
unmanaged_handle_unmap(&surface->unmap, NULL); unmanaged_handle_unmap(&surface->unmap, NULL);
} }
if (associated) {
unmanaged_handle_dissociate(&surface->dissociate, NULL);
}
unmanaged_handle_destroy(&surface->destroy, NULL); unmanaged_handle_destroy(&surface->destroy, NULL);
xsurface->data = NULL; xsurface->data = NULL;
struct sway_xwayland_view *xwayland_view = create_xwayland_view(xsurface); struct sway_xwayland_view *xwayland_view = create_xwayland_view(xsurface);
if (associated) {
handle_associate(&xwayland_view->associate, NULL);
}
if (mapped) { if (mapped) {
handle_map(&xwayland_view->map, xsurface); handle_map(&xwayland_view->map, xsurface);
} }
@ -531,20 +540,30 @@ static void handle_map(struct wl_listener *listener, void *data) {
transaction_commit_dirty(); transaction_commit_dirty();
} }
static void handle_dissociate(struct wl_listener *listener, void *data);
static void handle_override_redirect(struct wl_listener *listener, void *data) { static void handle_override_redirect(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view = struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, override_redirect); wl_container_of(listener, xwayland_view, override_redirect);
struct sway_view *view = &xwayland_view->view; struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
bool mapped = xsurface->surface != NULL && xsurface->surface->mapped; bool associated = xsurface->surface != NULL;
bool mapped = associated && xsurface->surface->mapped;
if (mapped) { if (mapped) {
handle_unmap(&xwayland_view->unmap, NULL); handle_unmap(&xwayland_view->unmap, NULL);
} }
if (associated) {
handle_dissociate(&xwayland_view->dissociate, NULL);
}
handle_destroy(&xwayland_view->destroy, view); handle_destroy(&xwayland_view->destroy, view);
xsurface->data = NULL; xsurface->data = NULL;
struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface); struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface);
if (associated) {
unmanaged_handle_associate(&unmanaged->associate, NULL);
}
if (mapped) { if (mapped) {
unmanaged_handle_map(&unmanaged->map, xsurface); unmanaged_handle_map(&unmanaged->map, xsurface);
} }