mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-20 06:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: asynchronously fetch property on notify event

Browse source 
Instead of blocking in the X11 property notify event handler,
asynchronously fetch the new property value.
This commit is contained in:
Simon Ser 2023-07-28 14:11:18 +02:00
parent bad03394e0
commit a4fd1fcc00
1 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

46
xwayland/xwm.c
View file

@ -1142,24 +1142,46 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm,
} }
} }
struct wlr_xwm_property_reply_handler {
struct wlr_xwm_reply_handler base;
xcb_window_t window;
xcb_atom_t property;
};
static void xwm_handle_property_reply(struct wlr_xwm *xwm,
struct wlr_xwm_reply_handler *reply_handler_base,
xcb_generic_reply_t *generic_reply) {
struct wlr_xwm_property_reply_handler *reply_handler =
wl_container_of(reply_handler_base, reply_handler, base);
xcb_get_property_reply_t *reply = (xcb_get_property_reply_t *)generic_reply;
if (reply == NULL) {
goto out;
}
struct wlr_xwayland_surface *xsurface = lookup_surface(xwm, reply_handler->window);
if (xsurface == NULL) {
goto out;
}
read_surface_property(xwm, xsurface, reply_handler->property, reply);
out:
free(reply_handler);
}
static void xwm_handle_property_notify(struct wlr_xwm *xwm, static void xwm_handle_property_notify(struct wlr_xwm *xwm,
xcb_property_notify_event_t *ev) { xcb_property_notify_event_t *ev) {
struct wlr_xwayland_surface *xsurface = lookup_surface(xwm, ev->window); struct wlr_xwm_property_reply_handler *reply_handler = calloc(1, sizeof(*reply_handler));
if (xsurface == NULL) { if (reply_handler == NULL) {
return; return;
} }
reply_handler->window = ev->window;
reply_handler->property = ev->atom;
xcb_get_property_cookie_t cookie = xcb_get_property_cookie_t cookie =
xcb_get_property(xwm->xcb_conn, 0, xsurface->window_id, ev->atom, XCB_ATOM_ANY, 0, 2048); xcb_get_property(xwm->xcb_conn, 0, ev->window, ev->atom, XCB_ATOM_ANY, 0, 2048);
xcb_get_property_reply_t *reply = xwm_init_reply_handler(xwm, &reply_handler->base, cookie.sequence, xwm_handle_property_reply);
xcb_get_property_reply(xwm->xcb_conn, cookie, NULL);
if (reply == NULL) {
wlr_log(WLR_ERROR, "Failed to get window property");
return;
}
read_surface_property(xwm, xsurface, ev->atom, reply);
free(reply);
} }
static void xwm_handle_surface_id_message(struct wlr_xwm *xwm, static void xwm_handle_surface_id_message(struct wlr_xwm *xwm,