Sivecano/dwl - Change RLFTJX3XEX5I2N5JDVBBYRN4INKH7MQGKC5SNJ4QFR243TRYKDXQC

use `l` instead of `layersurface`

layer_surface instead of wlr_layer_surface and scene_layer whenever a wlr_scene_tree is related to layer surfaces

Created by Leonardo Hernández Hernández on November 25, 2023

RLFTJX3XEX5I2N5JDVBBYRN4INKH7MQGKC5SNJ4QFR243TRYKDXQC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 472 [11.4]
B:BD[9.17824] → [10.123:152]
```
	LayerSurface *layersurface;
```
[9.17824]
[12.3]
```
	LayerSurface *l;
```

Replacement in dwl.c at line 475 [11.4]

B:BD[9.17964] → [10.153:353]

	wl_list_for_each(layersurface, list, link) {
		struct wlr_layer_surface_v1 *wlr_layer_surface = layersurface->layer_surface;
		struct wlr_layer_surface_v1_state *state = &wlr_layer_surface->current;

[9.17964]

[9.18475]

	wl_list_for_each(l, list, link) {
		struct wlr_layer_surface_v1 *layer_surface = l->layer_surface;
		struct wlr_layer_surface_v1_state *state = &layer_surface->current;

Replacement in dwl.c at line 482 [11.4]

B:BD[9.18538] → [13.54:146]

B:BD[13.146] → [14.40:162]

B:BD[14.162] → [2.5:113]

		wlr_scene_layer_surface_v1_configure(layersurface->scene_layer, &full_area, usable_area);
		wlr_scene_node_set_position(&layersurface->popups->node,
				layersurface->scene->node.x, layersurface->scene->node.y);
		layersurface->geom.x = layersurface->scene->node.x;
		layersurface->geom.y = layersurface->scene->node.y;

[9.18538]

[9.20496]

		wlr_scene_layer_surface_v1_configure(l->scene_layer, &full_area, usable_area);
		wlr_scene_node_set_position(&l->popups->node, l->scene->node.x, l->scene->node.y);
		l->geom.x = l->scene->node.x;
		l->geom.y = l->scene->node.y;

Insertion in dwl.c at line 494 [11.4]
[12.74]
[15.1860]
```
	LayerSurface *l;
```
Deletion in dwl.c at line 499 [11.4]
B:BD[15.2015] → [15.2015:2044]
```
	LayerSurface *layersurface;
```

Replacement in dwl.c at line 517 [11.4]

∅:D[16.63] → [10.557:598]

∅:D[17.90] → [10.557:598]

∅:D[18.102] → [10.557:598]

∅:D[19.110] → [10.557:598]

∅:D[20.110] → [10.557:598]

B:BD[9.22036] → [10.557:598]

∅:D[10.598] → [9.22070:22117]

B:BD[9.22070] → [9.22070:22117]

B:BD[9.22117] → [21.1287:1395]

		wl_list_for_each_reverse(layersurface,
				&m->layers[layers_above_shell[i]], link) {
			if (!locked && layersurface->layer_surface->current.keyboard_interactive
					&& layersurface->mapped) {

[19.110]

[22.259]

		wl_list_for_each_reverse(l, &m->layers[layers_above_shell[i]], link) {
			if (!locked && l->layer_surface->current.keyboard_interactive && l->mapped) {

Replacement in dwl.c at line 521 [11.4]

B:BD[23.814] → [24.115:243]

				exclusive_focus = layersurface;
				client_notify_enter(layersurface->layer_surface->surface, wlr_seat_get_keyboard(seat));

[23.814]

[25.167]

				exclusive_focus = l;
				client_notify_enter(l->layer_surface->surface, wlr_seat_get_keyboard(seat));

Replacement in dwl.c at line 708 [11.4]

B:BD[9.22755] → [10.740:906]

B:BD[24.331] → [26.250:334]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, surface_commit);
	struct wlr_layer_surface_v1 *wlr_layer_surface = layersurface->layer_surface;
	struct wlr_scene_tree *layer = layers[layermap[wlr_layer_surface->current.layer]];

[9.22755]

[8.6]

	LayerSurface *l = wl_container_of(listener, l, surface_commit);
	struct wlr_layer_surface_v1 *layer_surface = l->layer_surface;
	struct wlr_scene_tree *scene_layer = layers[layermap[layer_surface->current.layer]];

Replacement in dwl.c at line 713 [11.4]

B:BD[8.7] → [8.7:120]

	if (wlr_layer_surface->current.committed == 0
			&& layersurface->mapped == wlr_layer_surface->surface->mapped)

[8.7]

[8.120]

	if (layer_surface->current.committed == 0 && l->mapped == layer_surface->surface->mapped)

Replacement in dwl.c at line 715 [11.4]

B:BD[8.130] → [8.130:190]

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

[8.130]

[27.886]

	l->mapped = layer_surface->surface->mapped;

Replacement in dwl.c at line 717 [11.4]

B:BD[27.887] → [26.335:447]

∅:D[28.201] → [29.198:342]

∅:D[26.510] → [29.198:342]

B:BD[29.198] → [29.198:342]

B:BD[29.342] → [5.6:159]

	if (layer != layersurface->scene->node.parent) {
		wlr_scene_node_reparent(&layersurface->scene->node, layer);
		wl_list_remove(&layersurface->link);
		wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->current.layer],
				&layersurface->link);
		wlr_scene_node_reparent(&layersurface->popups->node, (wlr_layer_surface->current.layer
				< ZWLR_LAYER_SHELL_V1_LAYER_TOP ? layers[LyrTop] : layer));

[27.887]

[29.342]

	if (scene_layer != l->scene->node.parent) {
		wlr_scene_node_reparent(&l->scene->node, scene_layer);
		wl_list_remove(&l->link);
		wl_list_insert(&l->mon->layers[layer_surface->current.layer], &l->link);
		wlr_scene_node_reparent(&l->popups->node, (layer_surface->current.layer
				< ZWLR_LAYER_SHELL_V1_LAYER_TOP ? layers[LyrTop] : scene_layer));

Replacement in dwl.c at line 725 [11.4]
∅:D[30.442] → [31.160:195]
B:BD[9.23243] → [31.160:195]
```
	arrangelayers(layersurface->mon);
```
[9.23031]
[9.23243]
```
	arrangelayers(l->mon);
```

Replacement in dwl.c at line 794 [11.4]

B:BD[32.76] → [32.76:161]

	struct wlr_layer_surface_v1 *wlr_layer_surface = data;
	LayerSurface *layersurface;

[32.76]

[32.161]

	struct wlr_layer_surface_v1 *layer_surface = data;
	LayerSurface *l;
	struct wlr_surface *surface = layer_surface->surface;
	struct wlr_scene_tree *scene_layer = layers[layermap[layer_surface->pending.layer]];

Deletion in dwl.c at line 799 [11.4]

B:BD[32.207] → [33.5:85]

	struct wlr_scene_tree *l = layers[layermap[wlr_layer_surface->pending.layer]];

Replacement in dwl.c at line 800 [11.4]

B:BD[32.308] → [4.6:113]

∅:D[34.40] → [32.341:392]

∅:D[4.113] → [32.341:392]

B:BD[32.341] → [32.341:392]

	if (!wlr_layer_surface->output
			&& !(wlr_layer_surface->output = selmon ? selmon->wlr_output : NULL)) {
		wlr_layer_surface_v1_destroy(wlr_layer_surface);

[32.308]

[34.41]

	if (!layer_surface->output
			&& !(layer_surface->output = selmon ? selmon->wlr_output : NULL)) {
		wlr_layer_surface_v1_destroy(layer_surface);

Replacement in dwl.c at line 806 [11.4]

B:BD[32.393] → [3.6:83]

∅:D[35.81] → [32.443:689]

∅:D[3.83] → [32.443:689]

B:BD[32.443] → [32.443:689]

B:BD[32.689] → [36.336:405]

∅:D[36.405] → [32.749:776]

B:BD[32.749] → [32.749:776]

B:BD[32.776] → [36.406:479]

∅:D[36.479] → [32.840:869]

B:BD[32.840] → [32.840:869]

	layersurface = wlr_layer_surface->data = ecalloc(1, sizeof(*layersurface));
	layersurface->type = LayerShell;
	LISTEN(&wlr_layer_surface->surface->events.commit,
			&layersurface->surface_commit, commitlayersurfacenotify);
	LISTEN(&wlr_layer_surface->events.destroy, &layersurface->destroy,
			destroylayersurfacenotify);
	LISTEN(&wlr_layer_surface->surface->events.map, &layersurface->map,
			maplayersurfacenotify);
	LISTEN(&wlr_layer_surface->surface->events.unmap, &layersurface->unmap,
			unmaplayersurfacenotify);

[32.393]

[32.869]

	l = layer_surface->data = ecalloc(1, sizeof(*l));
	l->type = LayerShell;
	LISTEN(&surface->events.commit, &l->surface_commit, commitlayersurfacenotify);
	LISTEN(&surface->events.map, &l->map, maplayersurfacenotify);
	LISTEN(&surface->events.unmap, &l->unmap, unmaplayersurfacenotify);
	LISTEN(&layer_surface->events.destroy, &l->destroy, destroylayersurfacenotify);

Replacement in dwl.c at line 813 [11.4]

B:BD[32.870] → [32.870:974]

B:BD[32.1016] → [33.86:172]

∅:D[33.172] → [32.1145:1201]

B:BD[32.1145] → [32.1145:1201]

B:BD[32.1201] → [33.173:258]

	layersurface->layer_surface = wlr_layer_surface;
	layersurface->mon = wlr_layer_surface->output->data;
	layersurface->scene_layer = wlr_scene_layer_surface_v1_create(l, wlr_layer_surface);
	layersurface->scene = layersurface->scene_layer->tree;
	layersurface->popups = wlr_layer_surface->surface->data = wlr_scene_tree_create(l);

[32.870]

[32.1328]

	l->layer_surface = layer_surface;
	l->mon = layer_surface->output->data;
	l->scene_layer = wlr_scene_layer_surface_v1_create(scene_layer, layer_surface);
	l->scene = l->scene_layer->tree;
	l->popups = surface->data = wlr_scene_tree_create(scene_layer);
	l->scene->node.data = l;

Deletion in dwl.c at line 820 [11.4]
B:BD[32.1329] → [32.1329:1377]
```
	layersurface->scene->node.data = layersurface;
```

Replacement in dwl.c at line 821 [11.4]

B:BD[32.1378] → [32.1378:1481]

B:BD[32.1481] → [7.6:86]

	wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->pending.layer],
			&layersurface->link);
	wlr_surface_send_enter(wlr_layer_surface->surface, wlr_layer_surface->output);

[32.1378]

[32.1481]

	wl_list_insert(&l->mon->layers[layer_surface->pending.layer],&l->link);
	wlr_surface_send_enter(surface, layer_surface->output);

Replacement in dwl.c at line 827 [11.4]

B:BD[32.1581] → [32.1581:1783]

	old_state = wlr_layer_surface->current;
	wlr_layer_surface->current = wlr_layer_surface->pending;
	layersurface->mapped = 1;
	arrangelayers(layersurface->mon);
	wlr_layer_surface->current = old_state;

[32.1581]

[37.7]

	old_state = layer_surface->current;
	layer_surface->current = layer_surface->pending;
	l->mapped = 1;
	arrangelayers(l->mon);
	layer_surface->current = old_state;

Replacement in dwl.c at line 1049 [11.4]

B:BD[32.9150] → [32.9150:9230]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, destroy);

[32.9150]

[32.9230]

	LayerSurface *l = wl_container_of(listener, l, destroy);

Replacement in dwl.c at line 1051 [11.4]

B:BD[32.9231] → [32.9231:9507]

B:BD[32.9507] → [6.6:60]

∅:D[6.60] → [38.9854:9854]

∅:D[32.9507] → [38.9854:9854]

B:BD[39.171] → [38.9854:9854]

B:BD[38.9854] → [38.9855:9876]

	wl_list_remove(&layersurface->link);
	wl_list_remove(&layersurface->destroy.link);
	wl_list_remove(&layersurface->map.link);
	wl_list_remove(&layersurface->unmap.link);
	wl_list_remove(&layersurface->surface_commit.link);
	wlr_scene_node_destroy(&layersurface->scene->node);
	wlr_scene_node_destroy(&layersurface->popups->node);
	free(layersurface);

[32.9231]

[21.2261]

	wl_list_remove(&l->link);
	wl_list_remove(&l->destroy.link);
	wl_list_remove(&l->map.link);
	wl_list_remove(&l->unmap.link);
	wl_list_remove(&l->surface_commit.link);
	wlr_scene_node_destroy(&l->scene->node);
	wlr_scene_node_destroy(&l->popups->node);
	free(l);

Replacement in dwl.c at line 2485 [11.4]

B:BD[38.48378] → [38.48378:48456]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, unmap);

[38.48378]

[38.48456]

	LayerSurface *l = wl_container_of(listener, l, unmap);

Replacement in dwl.c at line 2487 [11.4]

B:BD[38.48457] → [38.48457:48582]

	layersurface->mapped = 0;
	wlr_scene_node_set_enabled(&layersurface->scene->node, 0);
	if (layersurface == exclusive_focus)

[38.48457]

[38.48582]

	l->mapped = 0;
	wlr_scene_node_set_enabled(&l->scene->node, 0);
	if (l == exclusive_focus)

Replacement in dwl.c at line 2491 [11.4]

B:BD[38.48608] → [38.48608:48842]

	if (layersurface->layer_surface->output
			&& (layersurface->mon = layersurface->layer_surface->output->data))
		arrangelayers(layersurface->mon);
	if (layersurface->layer_surface->surface ==
			seat->keyboard_state.focused_surface)

[38.48608]

[40.245]

	if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
		arrangelayers(l->mon);
	if (l->layer_surface->surface == seat->keyboard_state.focused_surface)