Sivecano/dwl - Change 34TOMU43GSVTGKBSPBPRFLQYCJZ35HV2BNHKUAJ6CPE4XZLADCLQC

chase wlroots map logic unification

Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>

Created by Leonardo Hernández Hernández on June 2, 2023

34TOMU43GSVTGKBSPBPRFLQYCJZ35HV2BNHKUAJ6CPE4XZLADCLQC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 125 [6.4]

[5.34]

	struct wl_listener associate;
	struct wl_listener dissociate;

Insertion in dwl.c at line 404 [6.4]

[7.356]

[8.36]

static void associatex11(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 407 [6.4]

[7.427]

static void dissociatex11(struct wl_listener *listener, void *data);

Replacement in dwl.c at line 769 [6.4]

B:BD[9.67] → [9.67:124]

			&& layersurface->mapped == wlr_layer_surface->mapped)

[9.67]

[9.124]

			&& layersurface->mapped == wlr_layer_surface->surface->mapped)

Replacement in dwl.c at line 771 [6.4]

∅:D[10.223] → [9.135:186]

B:BD[9.135] → [9.135:186]

	layersurface->mapped = wlr_layer_surface->mapped;

[9.134]

[9.186]

	layersurface->mapped = wlr_layer_surface->surface->mapped;

Replacement in dwl.c at line 861 [6.4]

B:BD[3.689] → [3.689:749]

	LISTEN(&wlr_layer_surface->events.map, &layersurface->map,

[3.689]

[3.749]

	LISTEN(&wlr_layer_surface->surface->events.map, &layersurface->map,

Replacement in dwl.c at line 863 [6.4]

B:BD[3.776] → [3.776:840]

	LISTEN(&wlr_layer_surface->events.unmap, &layersurface->unmap,

[3.776]

[3.840]

	LISTEN(&wlr_layer_surface->surface->events.unmap, &layersurface->unmap,

Replacement in dwl.c at line 1024 [6.4]

B:BD[3.5754] → [3.5754:5870]

	LISTEN(&xdg_surface->events.map, &c->map, mapnotify);
	LISTEN(&xdg_surface->events.unmap, &c->unmap, unmapnotify);

[3.5754]

[3.5870]

	LISTEN(&xdg_surface->surface->events.map, &c->map, mapnotify);
	LISTEN(&xdg_surface->surface->events.unmap, &c->unmap, unmapnotify);

Replacement in dwl.c at line 1062 [6.4]
B:BD[3.7562] → [3.7562:7565]
```
		
```
[3.7562]
[3.7565]
Deletion in dwl.c at line 1167 [6.4]
B:BD[11.10071] → [11.10071:10135]
```
	wl_list_remove(&c->map.link);
	wl_list_remove(&c->unmap.link);
```

Insertion in dwl.c at line 1172 [6.4]

[11.10289]

		wl_list_remove(&c->activate.link);
		wl_list_remove(&c->associate.link);

Insertion in dwl.c at line 1175 [6.4]
[11.10327]
[11.10327]
```
		wl_list_remove(&c->dissociate.link);
```

Replacement in dwl.c at line 1177 [6.4]

B:BD[11.10365] → [11.10365:10402]

		wl_list_remove(&c->activate.link);

[11.10365]

[11.10402]

	} else
#endif
	{
		wl_list_remove(&c->map.link);
		wl_list_remove(&c->unmap.link);

Deletion in dwl.c at line 1183 [6.4]
B:BD[11.10405] → [11.10405:10412]
```
#endif
```
Replacement in dwl.c at line 2608 [6.4]
B:BD[11.51761] → [11.51761:51800]
```
			if (!c->mon && client_is_mapped(c))
```
[11.51761]
[11.51800]
```
			if (!c->mon && client_surface(c)->mapped)
```

Insertion in dwl.c at line 2743 [6.4]

[11.54868]

}
void
associatex11(struct wl_listener *listener, void *data)
{
	Client *c = wl_container_of(listener, c, associate);
	LISTEN(&client_surface(c)->events.map, &c->map, mapnotify);
	LISTEN(&client_surface(c)->events.unmap, &c->unmap, unmapnotify);

Replacement in dwl.c at line 2781 [6.4]

B:BD[11.55750] → [2.201:311]

	LISTEN(&xsurface->events.map, &c->map, mapnotify);
	LISTEN(&xsurface->events.unmap, &c->unmap, unmapnotify);

[11.55750]

[2.311]

	LISTEN(&xsurface->events.associate, &c->associate, associatex11);
	LISTEN(&xsurface->events.dissociate, &c->dissociate, dissociatex11);

Insertion in dwl.c at line 2791 [6.4]

[11.56354]

void
dissociatex11(struct wl_listener *listener, void *data)
{
	Client *c = wl_container_of(listener, c, dissociate);
	wl_list_remove(&c->map.link);
	wl_list_remove(&c->unmap.link);
}

Deletion in client.h at line 226 [5.1473]

∅:D[4.69] → [12.178:345]

∅:D[13.1292] → [12.178:345]

B:BD[14.1874] → [12.178:345]

}
static inline int
client_is_mapped(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->mapped;
#endif
	return c->surface.xdg->mapped;