Sivecano/dwl - Change 2B3SWBLKAAQYLU33YJTU2LQMO337JXHRMWDZA3V3G3IEXIFK5P6QC

always set the same monitor and tags for child clients of a client

fixes #272

Created by Leonardo Hernández Hernández on July 19, 2022

2B3SWBLKAAQYLU33YJTU2LQMO337JXHRMWDZA3V3G3IEXIFK5P6QC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 1391 [8.4]

B:BD[6.13157] → [7.135:183]

	Client *c = wl_container_of(listener, c, map);

[6.13157]

[9.1374]

	Client *p, *c = wl_container_of(listener, c, map);

Replacement in dwl.c at line 1435 [8.4]

B:BD[10.1062] → [10.1062:1078]

	applyrules(c);

[10.1062]

[3.310]

	if ((p = client_get_parent(c))) {
		/* Set the same monitor and tags than its parent */
		c->isfloating = 1;
		wlr_scene_node_reparent(c->scene, layers[LyrFloat]);
		setmon(c, p->mon, p->tags);
	} else {
		applyrules(c);
	}

Insertion in client.h at line 27 [11.1473]

[2.251]

}
static inline Client *
client_from_wlr_surface(struct wlr_surface *s)
{
	struct wlr_xdg_surface *surface;
#ifdef XWAYLAND
	struct wlr_xwayland_surface *xsurface;
	if (s && wlr_surface_is_xwayland_surface(s)
			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s)))
		return xsurface->data;
#endif
	if (s && wlr_surface_is_xdg_surface(s)
			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
		return surface->data;
	return NULL;

Insertion in client.h at line 137 [11.1473]

[11.3414]

}
static inline Client *
client_get_parent(Client *c)
{
	Client *p;
#ifdef XWAYLAND
	if (client_is_x11(c) && c->surface.xwayland->parent)
		return client_from_wlr_surface(c->surface.xwayland->parent->surface);
#endif
	if (c->surface.xdg->toplevel->parent)
		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->surface);
	return NULL;

Deletion in client.h at line 269 [11.1473]

B:BD[4.236] → [4.236:239]

∅:D[4.239] → [12.316:339]

B:BD[12.316] → [12.316:339]

B:BD[12.339] → [13.11:58]

∅:D[13.58] → [14.181:183]

B:BD[14.181] → [14.181:183]

B:BD[14.183] → [13.59:150]

B:BD[13.150] → [5.11:51]

∅:D[5.51] → [13.206:299]

B:BD[13.206] → [13.206:299]

B:BD[13.299] → [5.52:87]

∅:D[5.87] → [13.350:497]

B:BD[13.350] → [13.350:497]

}
static inline Client *
client_from_wlr_surface(struct wlr_surface *s)
{
	struct wlr_xdg_surface *surface;
#ifdef XWAYLAND
	struct wlr_xwayland_surface *xsurface;
	if (wlr_surface_is_xwayland_surface(s)
			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s)))
		return xsurface->data;
#endif
	if (wlr_surface_is_xdg_surface(s)
			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
		return surface->data;
	return NULL;