hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwayland: remove _NET_WM_PID handler

Browse source 
We already get the PID from XRes and _NET_WM_PID code can overwrite it
with incorrect data.
This commit is contained in:
Aleksei Bavshin 2021-04-17 12:23:27 -07:00 committed by Simon Ser
parent e0f239fa28
commit e48dcdf72c
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwayland/xwm.c
View file

@ -546,18 +546,6 @@ static void read_surface_client_id(struct wlr_xwm *xwm,
free(reply); free(reply);
} }
static void read_surface_pid(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface,
xcb_get_property_reply_t *reply) {
if (reply->type != XCB_ATOM_CARDINAL) {
return;
}
pid_t *pid = xcb_get_property_value(reply);
xsurface->pid = *pid;
wlr_signal_emit_safe(&xsurface->events.set_pid, xsurface);
}
static void read_surface_window_type(struct wlr_xwm *xwm, static void read_surface_window_type(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface, struct wlr_xwayland_surface *xsurface,
xcb_get_property_reply_t *reply) { xcb_get_property_reply_t *reply) {
@ -758,7 +746,7 @@ static void read_surface_property(struct wlr_xwm *xwm,
} else if (property == XCB_ATOM_WM_TRANSIENT_FOR) { } else if (property == XCB_ATOM_WM_TRANSIENT_FOR) {
read_surface_parent(xwm, xsurface, reply); read_surface_parent(xwm, xsurface, reply);
} else if (property == xwm->atoms[NET_WM_PID]) { } else if (property == xwm->atoms[NET_WM_PID]) {
read_surface_pid(xwm, xsurface, reply); // intentionally ignored
} else if (property == xwm->atoms[NET_WM_WINDOW_TYPE]) { } else if (property == xwm->atoms[NET_WM_WINDOW_TYPE]) {
read_surface_window_type(xwm, xsurface, reply); read_surface_window_type(xwm, xsurface, reply);
} else if (property == xwm->atoms[WM_PROTOCOLS]) { } else if (property == xwm->atoms[WM_PROTOCOLS]) {
@ -849,7 +837,6 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm,
xwm->atoms[NET_WM_STATE], xwm->atoms[NET_WM_STATE],
xwm->atoms[NET_WM_WINDOW_TYPE], xwm->atoms[NET_WM_WINDOW_TYPE],
xwm->atoms[NET_WM_NAME], xwm->atoms[NET_WM_NAME],
xwm->atoms[NET_WM_PID],
}; };
for (size_t i = 0; i < sizeof(props)/sizeof(xcb_atom_t); i++) { for (size_t i = 0; i < sizeof(props)/sizeof(xcb_atom_t); i++) {
read_surface_property(xwm, xsurface, props[i]); read_surface_property(xwm, xsurface, props[i]);