nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: batch property requests when handling new window

Browse Source 
Instead of sending one request, waiting for the reply, and
repeating for all properties we're interested in, we can send all
property requests in one go and then wait for the server to reply.
This commit is contained in:
Simon Ser 2023-07-28 12:19:06 +02:00
parent ca19014af0
commit f5797be8a8
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xwayland/xwm.c
View File

@ -834,15 +834,8 @@ char *xwm_get_atom_name(struct wlr_xwm *xwm, xcb_atom_t atom) {
} }
static void read_surface_property(struct wlr_xwm *xwm, static void read_surface_property(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface, xcb_atom_t property) { struct wlr_xwayland_surface *xsurface, xcb_atom_t property,
xcb_get_property_cookie_t cookie = xcb_get_property(xwm->xcb_conn, 0, xcb_get_property_reply_t *reply) {
xsurface->window_id, property, XCB_ATOM_ANY, 0, 2048);
xcb_get_property_reply_t *reply = xcb_get_property_reply(xwm->xcb_conn,
cookie, NULL);
if (reply == NULL) {
return;
}
if (property == XCB_ATOM_WM_CLASS) { if (property == XCB_ATOM_WM_CLASS) {
read_surface_class(xwm, xsurface, reply); read_surface_class(xwm, xsurface, reply);
} else if (property == XCB_ATOM_WM_NAME || } else if (property == XCB_ATOM_WM_NAME ||
@ -876,8 +869,6 @@ static void read_surface_property(struct wlr_xwm *xwm,
property, prop_name ? prop_name : "(null)", xsurface->window_id); property, prop_name ? prop_name : "(null)", xsurface->window_id);
free(prop_name); free(prop_name);
} }
free(reply);
} }
static void xwayland_surface_handle_commit(struct wl_listener *listener, void *data) { static void xwayland_surface_handle_commit(struct wl_listener *listener, void *data) {
@ -942,9 +933,24 @@ static void xwayland_surface_associate(struct wlr_xwm *xwm,
xwm->atoms[NET_WM_WINDOW_TYPE], xwm->atoms[NET_WM_WINDOW_TYPE],
xwm->atoms[NET_WM_NAME], xwm->atoms[NET_WM_NAME],
}; };
for (size_t i = 0; i < sizeof(props)/sizeof(xcb_atom_t); i++) {
read_surface_property(xwm, xsurface, props[i]); xcb_get_property_cookie_t cookies[sizeof(props) / sizeof(props[0])] = {0};
for (size_t i = 0; i < sizeof(props) / sizeof(props[0]); i++) {
cookies[i] = xcb_get_property(xwm->xcb_conn, 0, xsurface->window_id,
props[i], XCB_ATOM_ANY, 0, 2048);
} }
for (size_t i = 0; i < sizeof(props) / sizeof(props[0]); i++) {
xcb_get_property_reply_t *reply =
xcb_get_property_reply(xwm->xcb_conn, cookies[i], NULL);
if (reply == NULL) {
wlr_log(WLR_ERROR, "Failed to get window property");
return;
}
read_surface_property(xwm, xsurface, props[i], reply);
free(reply);
}
if (xwm->xres) { if (xwm->xres) {
read_surface_client_id(xwm, xsurface); read_surface_client_id(xwm, xsurface);
} }
@ -1139,7 +1145,16 @@ static void xwm_handle_property_notify(struct wlr_xwm *xwm,
return; return;
} }
read_surface_property(xwm, xsurface, ev->atom); 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_reply_t *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);
} }
static void xwm_handle_surface_id_message(struct wlr_xwm *xwm, static void xwm_handle_surface_id_message(struct wlr_xwm *xwm,