jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-10-28 02:34:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle unmanaged xwayland mapping

Browse Source
This commit is contained in:
ARDiDo 2021-09-14 19:44:15 -04:00
parent 1e89aa72a3
commit 4a88a7025e
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dwl.c
View File

@ -383,7 +383,9 @@ static void activatex11(struct wl_listener *listener, void *data);
static void configurex11(struct wl_listener *listener, void *data); static void configurex11(struct wl_listener *listener, void *data);
static void createnotifyx11(struct wl_listener *listener, void *data); static void createnotifyx11(struct wl_listener *listener, void *data);
void commitnotifyx11(struct wl_listener *listener, void *data); void commitnotifyx11(struct wl_listener *listener, void *data);
static void damageallmons();
static Atom getatom(xcb_connection_t *xc, const char *name); static Atom getatom(xcb_connection_t *xc, const char *name);
static void mapnotify_unmanaged(struct wl_listener *listener, void *data);
static void renderindependents(struct wlr_output *output, struct timespec *now); static void renderindependents(struct wlr_output *output, struct timespec *now);
static void xwaylandready(struct wl_listener *listener, void *data); static void xwaylandready(struct wl_listener *listener, void *data);
static Client *xytoindependent(double x, double y); static Client *xytoindependent(double x, double y);
@ -2584,6 +2586,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
{ {
struct wlr_xwayland_surface *xwayland_surface = data; struct wlr_xwayland_surface *xwayland_surface = data;
Client *c; Client *c;
wlr_xwayland_surface_ping(xwayland_surface);
wl_list_for_each(c, &clients, link) wl_list_for_each(c, &clients, link)
if (c->isfullscreen && VISIBLEON(c, c->mon)) if (c->isfullscreen && VISIBLEON(c, c->mon))
setfullscreen(c, 0); setfullscreen(c, 0);
@ -2596,7 +2599,10 @@ createnotifyx11(struct wl_listener *listener, void *data)
c->isfullscreen = 0; c->isfullscreen = 0;
/* Listen to the various events it can emit */ /* Listen to the various events it can emit */
LISTEN(&xwayland_surface->events.map, &c->map, mapnotify); if (c->type == X11Managed)
LISTEN(&xwayland_surface->events.map, &c->map, mapnotify);
else
LISTEN(&xwayland_surface->events.map, &c->map, mapnotify_unmanaged);
LISTEN(&xwayland_surface->events.unmap, &c->unmap, unmapnotify); LISTEN(&xwayland_surface->events.unmap, &c->unmap, unmapnotify);
LISTEN(&xwayland_surface->events.request_activate, &c->activate, LISTEN(&xwayland_surface->events.request_activate, &c->activate,
activatex11); activatex11);
@ -2614,7 +2620,20 @@ commitnotifyx11(struct wl_listener *listener, void *data)
Client *c = wl_container_of(listener, c, commit); Client *c = wl_container_of(listener, c, commit);
// Damage the whole screen // Damage the whole screen
wlr_output_damage_add_whole(c->mon->damage); if (c->type == X11Managed)
wlr_output_damage_add_whole(c->mon->damage);
else
damageallmons();
}
void
damageallmons()
{
Monitor *m;
wl_list_for_each(m, &mons, link)
if (m && m->wlr_output && m->damage)
wlr_output_damage_add_whole(m->damage);
} }
Atom Atom
@ -2630,6 +2649,19 @@ getatom(xcb_connection_t *xc, const char *name)
return atom; return atom;
} }
void
mapnotify_unmanaged(struct wl_listener *listener, void *data)
{
Client *c = wl_container_of(listener, c, map);
struct wlr_xwayland_surface *xwayland_surface = c->surface.xwayland;
wl_list_insert(&independents, &c->link);
LISTEN(&xwayland_surface->surface->events.commit, &c->commit, commitnotifyx11);
client_get_geometry(c, &c->geom);
damageallmons();
}
void void
renderindependents(struct wlr_output *output, struct timespec *now) renderindependents(struct wlr_output *output, struct timespec *now)
{ {