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

xwm: Add _NET_CLIENT_LIST support 

Fixes: https://github.com/swaywm/wlroots/issues/1469
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2019-02-13 11:18:46 +01:00 committed by emersion
parent 69b9e2ae8f
commit e7d9cf5815
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xwayland/xwm.h
View File

@ -80,6 +80,7 @@ enum atom_name {
DND_ACTION_COPY, DND_ACTION_COPY,
DND_ACTION_ASK, DND_ACTION_ASK,
DND_ACTION_PRIVATE, DND_ACTION_PRIVATE,
_NET_CLIENT_LIST,
ATOM_LAST, ATOM_LAST,
}; };

27
xwayland/xwm.c
View File

@ -78,6 +78,7 @@ const char *atom_map[ATOM_LAST] = {
"XdndActionCopy", "XdndActionCopy",
"XdndActionAsk", "XdndActionAsk",
"XdndActionPrivate", "XdndActionPrivate",
"_NET_CLIENT_LIST",
}; };
static const struct wlr_surface_role xwayland_surface_role; static const struct wlr_surface_role xwayland_surface_role;
@ -212,6 +213,28 @@ static void xwm_send_wm_message(struct wlr_xwayland_surface *surface,
xcb_flush(xwm->xcb_conn); xcb_flush(xwm->xcb_conn);
} }
static void xwm_set_net_client_list(struct wlr_xwm *xwm) {
size_t mapped_surfaces = 0;
struct wlr_xwayland_surface *surface;
wl_list_for_each(surface, &xwm->surfaces, link) {
if (surface->mapped) {
mapped_surfaces++;
}
}
xcb_window_t windows[mapped_surfaces + 1];
size_t index = 0;
wl_list_for_each(surface, &xwm->surfaces, link) {
if (surface->mapped) {
windows[index++] = surface->window_id;
}
}
xcb_change_property(xwm->xcb_conn, XCB_PROP_MODE_REPLACE,
xwm->screen->root, xwm->atoms[_NET_CLIENT_LIST],
XCB_ATOM_WINDOW, 32, mapped_surfaces, windows);
}
static void xwm_send_focus_window(struct wlr_xwm *xwm, static void xwm_send_focus_window(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface) { struct wlr_xwayland_surface *xsurface) {
if (!xsurface) { if (!xsurface) {
@ -702,6 +725,7 @@ static void xwayland_surface_role_commit(struct wlr_surface *wlr_surface) {
if (!surface->mapped && wlr_surface_has_buffer(surface->surface)) { if (!surface->mapped && wlr_surface_has_buffer(surface->surface)) {
wlr_signal_emit_safe(&surface->events.map, surface); wlr_signal_emit_safe(&surface->events.map, surface);
surface->mapped = true; surface->mapped = true;
xwm_set_net_client_list(surface->xwm);
} }
} }
@ -718,6 +742,7 @@ static void xwayland_surface_role_precommit(struct wlr_surface *wlr_surface) {
if (surface->mapped) { if (surface->mapped) {
wlr_signal_emit_safe(&surface->events.unmap, surface); wlr_signal_emit_safe(&surface->events.unmap, surface);
surface->mapped = false; surface->mapped = false;
xwm_set_net_client_list(surface->xwm);
} }
} }
} }
@ -770,6 +795,7 @@ static void xsurface_unmap(struct wlr_xwayland_surface *surface) {
if (surface->mapped) { if (surface->mapped) {
surface->mapped = false; surface->mapped = false;
wlr_signal_emit_safe(&surface->events.unmap, surface); wlr_signal_emit_safe(&surface->events.unmap, surface);
xwm_set_net_client_list(surface->xwm);
} }
if (surface->surface_id) { if (surface->surface_id) {
@ -1712,6 +1738,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
xwm->atoms[_NET_WM_STATE_FULLSCREEN], xwm->atoms[_NET_WM_STATE_FULLSCREEN],
xwm->atoms[_NET_WM_STATE_MAXIMIZED_VERT], xwm->atoms[_NET_WM_STATE_MAXIMIZED_VERT],
xwm->atoms[_NET_WM_STATE_MAXIMIZED_HORZ], xwm->atoms[_NET_WM_STATE_MAXIMIZED_HORZ],
xwm->atoms[_NET_CLIENT_LIST],
}; };
xcb_change_property(xwm->xcb_conn, xcb_change_property(xwm->xcb_conn,
XCB_PROP_MODE_REPLACE, XCB_PROP_MODE_REPLACE,