blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwm: get rid of displayable surfaces list

This commit is contained in:
Tony Crisci 2017-10-24 18:57:20 -04:00
parent 79e14f65e0
commit 2ff94d0036
4 changed files with 42 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wlr/xwayland.h
View File

@ -25,7 +25,6 @@ struct wlr_xwayland {
struct wl_event_source *sigusr1_source; struct wl_event_source *sigusr1_source;
struct wl_listener destroy_listener; struct wl_listener destroy_listener;
struct wlr_xwm *xwm; struct wlr_xwm *xwm;
struct wl_list displayable_surfaces; // wlr_xwayland_surface::displayable_link
struct { struct {
struct wl_signal new_surface; struct wl_signal new_surface;
@ -69,13 +68,8 @@ struct wlr_xwayland_surface {
struct wlr_xwm *xwm; struct wlr_xwm *xwm;
uint32_t surface_id; uint32_t surface_id;
struct wl_list displayable_link; struct wl_list link;
// XXX: I think this is just a list of all the surfaces
struct wl_list new_link;
struct wl_list unpaired_link; struct wl_list unpaired_link;
bool displayable;
bool unpaired;
struct wlr_surface *surface; struct wlr_surface *surface;
int16_t x, y; int16_t x, y;

1
xwayland/xwayland.c
View File

@ -205,7 +205,6 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1; wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1;
wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1;
wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1;
wl_list_init(&wlr_xwayland->displayable_surfaces);
wl_signal_init(&wlr_xwayland->events.new_surface); wl_signal_init(&wlr_xwayland->events.new_surface);
wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd); wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd);

105
xwayland/xwm.c
View File

@ -39,18 +39,7 @@ const char *atom_map[ATOM_LAST] = {
static struct wlr_xwayland_surface *lookup_surface(struct wlr_xwm *xwm, static struct wlr_xwayland_surface *lookup_surface(struct wlr_xwm *xwm,
xcb_window_t window_id) { xcb_window_t window_id) {
struct wlr_xwayland_surface *surface; struct wlr_xwayland_surface *surface;
wl_list_for_each(surface, &xwm->new_surfaces, new_link) { wl_list_for_each(surface, &xwm->surfaces, link) {
if (surface->window_id == window_id) {
return surface;
}
}
return NULL;
}
static struct wlr_xwayland_surface *lookup_displayable_surface(struct wlr_xwm *xwm,
xcb_window_t window_id) {
struct wlr_xwayland_surface *surface;
wl_list_for_each(surface, &xwm->xwayland->displayable_surfaces, displayable_link) {
if (surface->window_id == window_id) { if (surface->window_id == window_id) {
return surface; return surface;
} }
@ -69,17 +58,6 @@ static struct wlr_xwayland_surface *lookup_unpaired_surface(struct wlr_xwm *xwm,
return NULL; return NULL;
} }
static struct wlr_xwayland_surface *lookup_surface_any(struct wlr_xwm *xwm,
xcb_window_t window_id) {
struct wlr_xwayland_surface *surface;
if ((surface = lookup_displayable_surface(xwm, window_id)) ||
(surface = lookup_unpaired_surface(xwm, window_id)) ||
(surface = lookup_surface(xwm, window_id))) {
return surface;
}
return NULL;
}
static struct wlr_xwayland_surface *wlr_xwayland_surface_create( static struct wlr_xwayland_surface *wlr_xwayland_surface_create(
struct wlr_xwm *xwm, xcb_window_t window_id, int16_t x, int16_t y, struct wlr_xwm *xwm, xcb_window_t window_id, int16_t x, int16_t y,
uint16_t width, uint16_t height, bool override_redirect) { uint16_t width, uint16_t height, bool override_redirect) {
@ -104,7 +82,7 @@ static struct wlr_xwayland_surface *wlr_xwayland_surface_create(
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
surface->override_redirect = override_redirect; surface->override_redirect = override_redirect;
wl_list_insert(&xwm->new_surfaces, &surface->new_link); wl_list_insert(&xwm->surfaces, &surface->link);
surface->state = wlr_list_create(); surface->state = wlr_list_create();
wl_signal_init(&surface->events.destroy); wl_signal_init(&surface->events.destroy);
wl_signal_init(&surface->events.request_configure); wl_signal_init(&surface->events.request_configure);
@ -120,16 +98,10 @@ static struct wlr_xwayland_surface *wlr_xwayland_surface_create(
static void wlr_xwayland_surface_destroy(struct wlr_xwayland_surface *surface) { static void wlr_xwayland_surface_destroy(struct wlr_xwayland_surface *surface) {
wl_signal_emit(&surface->events.destroy, surface); wl_signal_emit(&surface->events.destroy, surface);
wl_list_remove(&surface->new_link); wl_list_remove(&surface->link);
if (surface->unpaired) { if (surface->surface_id) {
wl_list_remove(&surface->unpaired_link); wl_list_remove(&surface->unpaired_link);
surface->unpaired = false;
}
if (surface->displayable) {
wl_list_remove(&surface->displayable_link);
surface->displayable = false;
} }
for (size_t i = 0; i < surface->state->length; i++) { for (size_t i = 0; i < surface->state->length; i++) {
@ -229,7 +201,7 @@ static void read_surface_parent(struct wlr_xwm *xwm,
xcb_window_t *xid = xcb_get_property_value(reply); xcb_window_t *xid = xcb_get_property_value(reply);
if (xid != NULL) { if (xid != NULL) {
surface->parent = lookup_surface_any(xwm, *xid); surface->parent = lookup_surface(xwm, *xid);
} else { } else {
surface->parent = NULL; surface->parent = NULL;
} }
@ -477,6 +449,7 @@ static void handle_surface_destroy(struct wl_listener *listener, void *data) {
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
wl_container_of(listener, xsurface, surface_destroy); wl_container_of(listener, xsurface, surface_destroy);
xsurface->surface = NULL;
// TODO destroy xwayland surface? // TODO destroy xwayland surface?
} }
@ -504,12 +477,6 @@ static void map_shell_surface(struct wlr_xwm *xwm,
read_surface_property(xwm, xsurface, props[i]); read_surface_property(xwm, xsurface, props[i]);
} }
if (!xsurface->displayable) {
wl_list_insert(&xwm->xwayland->displayable_surfaces,
&xsurface->displayable_link);
xsurface->displayable = true;
}
xsurface->surface_commit.notify = handle_surface_commit; xsurface->surface_commit.notify = handle_surface_commit;
wl_signal_add(&surface->events.commit, &xsurface->surface_commit); wl_signal_add(&surface->events.commit, &xsurface->surface_commit);
@ -530,7 +497,7 @@ static void handle_create_notify(struct wlr_xwm *xwm,
static void handle_destroy_notify(struct wlr_xwm *xwm, static void handle_destroy_notify(struct wlr_xwm *xwm,
xcb_destroy_notify_event_t *ev) { xcb_destroy_notify_event_t *ev) {
wlr_log(L_DEBUG, "XCB_DESTROY_NOTIFY (%u)", ev->window); wlr_log(L_DEBUG, "XCB_DESTROY_NOTIFY (%u)", ev->window);
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); struct wlr_xwayland_surface *surface = lookup_surface(xwm, ev->window);
if (surface == NULL) { if (surface == NULL) {
return; return;
} }
@ -541,7 +508,7 @@ static void handle_configure_request(struct wlr_xwm *xwm,
xcb_configure_request_event_t *ev) { xcb_configure_request_event_t *ev) {
wlr_log(L_DEBUG, "XCB_CONFIGURE_REQUEST (%u) [%ux%u+%d,%d]", ev->window, wlr_log(L_DEBUG, "XCB_CONFIGURE_REQUEST (%u) [%ux%u+%d,%d]", ev->window,
ev->width, ev->height, ev->x, ev->y); ev->width, ev->height, ev->x, ev->y);
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); struct wlr_xwayland_surface *surface = lookup_surface(xwm, ev->window);
if (surface == NULL) { if (surface == NULL) {
return; return;
} }
@ -574,7 +541,7 @@ static void handle_configure_request(struct wlr_xwm *xwm,
static void handle_configure_notify(struct wlr_xwm *xwm, static void handle_configure_notify(struct wlr_xwm *xwm,
xcb_configure_notify_event_t *ev) { xcb_configure_notify_event_t *ev) {
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
lookup_surface_any(xwm, ev->window); lookup_surface(xwm, ev->window);
if (!xsurface) { if (!xsurface) {
return; return;
@ -594,7 +561,7 @@ static void handle_map_request(struct wlr_xwm *xwm,
static void handle_map_notify(struct wlr_xwm *xwm, xcb_map_notify_event_t *ev) { static void handle_map_notify(struct wlr_xwm *xwm, xcb_map_notify_event_t *ev) {
wlr_log(L_DEBUG, "XCB_MAP_NOTIFY (%u)", ev->window); wlr_log(L_DEBUG, "XCB_MAP_NOTIFY (%u)", ev->window);
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); struct wlr_xwayland_surface *surface = lookup_surface(xwm, ev->window);
if (surface != NULL) { if (surface != NULL) {
surface->override_redirect = ev->override_redirect; surface->override_redirect = ev->override_redirect;
} else { } else {
@ -606,18 +573,32 @@ static void handle_map_notify(struct wlr_xwm *xwm, xcb_map_notify_event_t *ev) {
static void handle_unmap_notify(struct wlr_xwm *xwm, static void handle_unmap_notify(struct wlr_xwm *xwm,
xcb_unmap_notify_event_t *ev) { xcb_unmap_notify_event_t *ev) {
wlr_log(L_DEBUG, "XCB_UNMAP_NOTIFY (%u)", ev->window); wlr_log(L_DEBUG, "XCB_UNMAP_NOTIFY (%u)", ev->window);
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); struct wlr_xwayland_surface *xsurface = lookup_surface(xwm, ev->window);
if (surface == NULL) { if (xsurface == NULL) {
return; return;
} }
// TODO: remove pointer to surface only?
wlr_xwayland_surface_destroy(surface); if (xsurface->surface_id) {
// Make sure we're not on the unpaired surface list or we
// could be assigned a surface during surface creation that
// was mapped before this unmap request.
wl_list_remove(&xsurface->unpaired_link);
xsurface->surface_id = 0;
}
if (xsurface->surface) {
wl_list_remove(&xsurface->surface_commit.link);
wl_list_remove(&xsurface->surface_destroy.link);
xsurface->surface = NULL;
}
wlr_xwayland_surface_destroy(xsurface);
} }
static void handle_property_notify(struct wlr_xwm *xwm, static void handle_property_notify(struct wlr_xwm *xwm,
xcb_property_notify_event_t *ev) { xcb_property_notify_event_t *ev) {
wlr_log(L_DEBUG, "XCB_PROPERTY_NOTIFY (%u)", ev->window); wlr_log(L_DEBUG, "XCB_PROPERTY_NOTIFY (%u)", ev->window);
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); struct wlr_xwayland_surface *surface = lookup_surface(xwm, ev->window);
if (surface == NULL) { if (surface == NULL) {
return; return;
} }
@ -636,21 +617,20 @@ static void handle_client_message(struct wlr_xwm *xwm,
ev->window); ev->window);
return; return;
} }
surface->surface_id = ev->data.data32[0];
/* Check if we got notified after wayland surface create event */ /* Check if we got notified after wayland surface create event */
struct wl_resource *resource = wl_client_get_object( uint32_t id = ev->data.data32[0];
xwm->xwayland->client, surface->surface_id); struct wl_resource *resource =
wl_client_get_object(xwm->xwayland->client, id);
if (resource) { if (resource) {
map_shell_surface(xwm, surface, wl_resource_get_user_data(resource)); surface->surface_id = 0;
map_shell_surface(xwm,
surface, wl_resource_get_user_data(resource));
} else { } else {
if (!surface->unpaired) { surface->surface_id = id;
wl_list_insert(&xwm->unpaired_surfaces, &surface->unpaired_link); wl_list_insert(&xwm->unpaired_surfaces, &surface->unpaired_link);
surface->unpaired = true;
}
} }
} else if (ev->type == xwm->atoms[NET_WM_STATE]) { } else if (ev->type == xwm->atoms[NET_WM_STATE]) {
struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, struct wlr_xwayland_surface *surface = lookup_surface(xwm, ev->window);
ev->window);
if (surface == NULL) { if (surface == NULL) {
return; return;
} }
@ -839,14 +819,7 @@ void xwm_destroy(struct wlr_xwm *xwm) {
wl_event_source_remove(xwm->event_source); wl_event_source_remove(xwm->event_source);
} }
struct wlr_xwayland_surface *surface, *tmp; struct wlr_xwayland_surface *surface, *tmp;
wl_list_for_each_safe(surface, tmp, &xwm->xwayland->displayable_surfaces, wl_list_for_each_safe(surface, tmp, &xwm->surfaces, link) {
displayable_link) {
wlr_xwayland_surface_destroy(surface);
}
wl_list_for_each_safe(surface, tmp, &xwm->new_surfaces, new_link) {
wlr_xwayland_surface_destroy(surface);
}
wl_list_for_each_safe(surface, tmp, &xwm->unpaired_surfaces, unpaired_link) {
wlr_xwayland_surface_destroy(surface); wlr_xwayland_surface_destroy(surface);
} }
wl_list_remove(&xwm->compositor_surface_create.link); wl_list_remove(&xwm->compositor_surface_create.link);
@ -891,7 +864,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
} }
xwm->xwayland = wlr_xwayland; xwm->xwayland = wlr_xwayland;
wl_list_init(&xwm->new_surfaces); wl_list_init(&xwm->surfaces);
wl_list_init(&xwm->unpaired_surfaces); wl_list_init(&xwm->unpaired_surfaces);
xwm->xcb_conn = xcb_connect_to_fd(wlr_xwayland->wm_fd[0], NULL); xwm->xcb_conn = xcb_connect_to_fd(wlr_xwayland->wm_fd[0], NULL);

2
xwayland/xwm.h
View File

@ -44,7 +44,7 @@ struct wlr_xwm {
struct wlr_xwayland_surface *focus_surface; struct wlr_xwayland_surface *focus_surface;
struct wl_list new_surfaces; // wlr_xwayland_surface::new_link struct wl_list surfaces; // wlr_xwayland_surface::link
struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link
const xcb_query_extension_reply_t *xfixes; const xcb_query_extension_reply_t *xfixes;