alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix xwayland unmanaged surfaces

Browse source
This commit is contained in:
emersion 2018-04-05 17:08:30 -04:00
parent f5e5b1819b
commit 7ce1038478
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 57 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/tree/view.h
View file

@ -87,6 +87,9 @@ struct sway_xwayland_unmanaged {
struct wlr_xwayland_surface *wlr_xwayland_surface;
struct wl_list link;
struct wl_listener commit;
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener destroy;
};

1
sway/desktop/wl_shell.c
View file

@ -68,6 +68,7 @@ static const struct sway_view_impl view_impl = {
.get_prop = get_prop,
.configure = configure,
.close = _close,
.destroy = destroy,
};
static void handle_commit(struct wl_listener *listener, void *data) {

1
sway/desktop/xdg_shell_v6.c
View file

@ -147,6 +147,7 @@ static const struct sway_view_impl view_impl = {
.configure = configure,
.set_activated = set_activated,
.close = _close,
.destroy = destroy,
};
static void handle_commit(struct wl_listener *listener, void *data) {

68
sway/desktop/xwayland.c
View file

@ -14,30 +14,65 @@
#include "sway/input/input-manager.h"
#include "log.h"
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *sway_surface =
wl_container_of(listener, sway_surface, destroy);
wl_list_remove(&sway_surface->destroy.link);
wl_list_remove(&sway_surface->link);
free(sway_surface);
static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, commit);
// TODO: damage tracking
}
static void create_unmanaged(struct wlr_xwayland_surface *xsurface) {
struct sway_xwayland_unmanaged *sway_surface =
static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, map);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
wl_list_insert(&root_container.sway_root->xwayland_unmanaged,
&surface->link);
wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
surface->commit.notify = unmanaged_handle_commit;
// TODO: damage tracking
}
static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, unmap);
wl_list_remove(&surface->link);
wl_list_remove(&surface->commit.link);
// TODO: damage tracking
}
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, destroy);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
if (xsurface->mapped) {
unmanaged_handle_unmap(&surface->unmap, xsurface);
}
wl_list_remove(&surface->map.link);
wl_list_remove(&surface->unmap.link);
wl_list_remove(&surface->destroy.link);
free(surface);
}
static struct sway_xwayland_unmanaged *create_unmanaged(
struct wlr_xwayland_surface *xsurface) {
struct sway_xwayland_unmanaged *surface =
calloc(1, sizeof(struct sway_xwayland_unmanaged));
if (!sway_assert(sway_surface, "Failed to allocate surface")) {
return;
if (surface == NULL) {
wlr_log(L_ERROR, "Allocation failed");
return NULL;
}
sway_surface->wlr_xwayland_surface = xsurface;
surface->wlr_xwayland_surface = xsurface;
wl_signal_add(&xsurface->events.destroy, &sway_surface->destroy);
sway_surface->destroy.notify = unmanaged_handle_destroy;
wl_signal_add(&xsurface->events.map, &surface->map);
surface->map.notify = unmanaged_handle_map;
wl_signal_add(&xsurface->events.unmap, &surface->unmap);
surface->unmap.notify = unmanaged_handle_unmap;
wl_signal_add(&xsurface->events.destroy, &surface->destroy);
surface->destroy.notify = unmanaged_handle_destroy;
wl_list_insert(&root_container.sway_root->xwayland_unmanaged,
&sway_surface->link);
unmanaged_handle_map(&surface->map, xsurface);
// TODO: damage tracking
return surface;
}
@ -127,6 +162,7 @@ static const struct sway_view_impl view_impl = {
.configure = configure,
.set_activated = set_activated,
.close = _close,
.destroy = destroy,
};
static void handle_commit(struct wl_listener *listener, void *data) {