diff options
| author | Aleksei Bavshin <alebastr89@gmail.com> | 2021-04-17 12:23:27 -0700 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-04-23 09:55:01 +0200 |
| commit | e48dcdf72ccf5af3a5022591f344588044a19bba (patch) | |
| tree | e31702631383ed56df75f600ad65550472a1d8a6 | |
| parent | e0f239fa2828318e9eff6b68f7faafecd338914c (diff) | |
xwayland: remove _NET_WM_PID handler
We already get the PID from XRes and _NET_WM_PID code can overwrite it
with incorrect data.
| -rw-r--r-- | xwayland/xwm.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 9ac2773d..7e463866 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -546,18 +546,6 @@ static void read_surface_client_id(struct wlr_xwm *xwm, 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, struct wlr_xwayland_surface *xsurface, 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) { read_surface_parent(xwm, xsurface, reply); } 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]) { read_surface_window_type(xwm, xsurface, reply); } 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_WINDOW_TYPE], xwm->atoms[NET_WM_NAME], - xwm->atoms[NET_WM_PID], }; for (size_t i = 0; i < sizeof(props)/sizeof(xcb_atom_t); i++) { read_surface_property(xwm, xsurface, props[i]); |