Sivecano/dwl - Change DADSQJFKYX6U5JOHSHJWWDSUFC7ZWSZVHFMEKPZEXKPELMEQBL2QC

improve naming

rename Layer to LayerSurface; layer should refer to overlay, top, bottom or background LayerSurface variables are always called layersurface wlr_layer_surface_v1 variables are always called wlr_layer_surface

Created by Guido Cella on August 26, 2020

DADSQJFKYX6U5JOHSHJWWDSUFC7ZWSZVHFMEKPZEXKPELMEQBL2QC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 143 [3.4]
B:BD[2.14754] → [2.14754:14763]
```
} Layer;
```
[2.14754]
[2.14763]
```
} LayerSurface;
```

Replacement in dwl.c at line 157 [3.4]

B:BD[4.120] → [2.14782:14824]

	struct wl_list layers[4]; // Layer::link

[4.120]

[5.371]

	struct wl_list layers[4]; // LayerSurface::link

Replacement in dwl.c at line 264 [3.4]

B:BD[6.80] → [2.15443:15481]

static void unmaplayer(Layer *layer);

[6.80]

[7.2135]

static void unmaplayer(LayerSurface *layersurface);

Replacement in dwl.c at line 473 [3.4]
B:BD[2.17824] → [2.17824:17839]
```
	Layer *layer;
```
[2.17824]
[2.17839]
```
	LayerSurface *layersurface;
```

Replacement in dwl.c at line 478 [3.4]

B:BD[2.17964] → [2.17964:18142]

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

[2.17964]

[2.18142]

	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;

Replacement in dwl.c at line 536 [3.4]

B:BD[2.20181] → [2.20181:20227]

			wlr_layer_surface_v1_close(layer_surface);

[2.20181]

[2.20227]

			wlr_layer_surface_v1_close(wlr_layer_surface);

Replacement in dwl.c at line 539 [3.4]
B:BD[2.20244] → [2.20244:20264]
```
		layer->geo = box;
```
[2.20244]
[2.20264]
```
		layersurface->geo = box;
```

Replacement in dwl.c at line 544 [3.4]

B:BD[2.20424] → [2.20424:20496]

		wlr_layer_surface_v1_configure(layer_surface, box.width, box.height);

[2.20424]

[2.20496]

		wlr_layer_surface_v1_configure(wlr_layer_surface, box.width, box.height);

Replacement in dwl.c at line 557 [3.4]
B:BD[2.20727] → [2.20727:20759]
```
	Layer *layer, *topmost = NULL;
```
[2.20727]
[2.20759]
```
	LayerSurface *layersurface, *topmost = NULL;
```
Replacement in dwl.c at line 591 [3.4]
B:BD[2.22036] → [2.22036:22070]
```
		wl_list_for_each_reverse(layer,
```
[2.22036]
[2.22070]
```
		wl_list_for_each_reverse(layersurface,
```

Replacement in dwl.c at line 593 [3.4]

B:BD[2.22117] → [2.22117:22236]

			if (layer->layer_surface->current.keyboard_interactive &&
					layer->layer_surface->mapped) {
				topmost = layer;

[2.22117]

[2.22236]

			if (layersurface->layer_surface->current.keyboard_interactive &&
					layersurface->layer_surface->mapped) {
				topmost = layersurface;

Replacement in dwl.c at line 716 [3.4]

B:BD[2.22755] → [2.22755:22945]

	Layer *layer = wl_container_of(listener, layer, surface_commit);
	struct wlr_layer_surface_v1 *layer_surface = layer->layer_surface;
	struct wlr_output *wlr_output = layer_surface->output;

[2.22755]

[2.22945]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, surface_commit);
	struct wlr_layer_surface_v1 *wlr_layer_surface = layersurface->layer_surface;
	struct wlr_output *wlr_output = wlr_layer_surface->output;

Replacement in dwl.c at line 727 [3.4]

B:BD[2.23031] → [2.23031:23240]

	if (layer->layer != layer_surface->current.layer) {
		wl_list_remove(&layer->link);
		wl_list_insert(&m->layers[layer_surface->current.layer],
			&layer->link);
		layer->layer = layer_surface->current.layer;

[2.23031]

[2.23240]

	if (layersurface->layer != wlr_layer_surface->current.layer) {
		wl_list_remove(&layersurface->link);
		wl_list_insert(&m->layers[wlr_layer_surface->current.layer],
			&layersurface->link);
		layersurface->layer = wlr_layer_surface->current.layer;

Replacement in dwl.c at line 874 [3.4]

B:BD[2.23428] → [2.23428:23495]

	struct wlr_layer_surface_v1 *layer_surface = data;
	Layer *layer;

[2.23428]

[2.23495]

	struct wlr_layer_surface_v1 *wlr_layer_surface = data;
	LayerSurface *layersurface;

Replacement in dwl.c at line 879 [3.4]

B:BD[2.23555] → [2.23555:23632]

	if (!layer_surface->output) {
		layer_surface->output = selmon->wlr_output;

[2.23555]

[2.23632]

	if (!wlr_layer_surface->output) {
		wlr_layer_surface->output = selmon->wlr_output;

Replacement in dwl.c at line 883 [3.4]

B:BD[2.23636] → [2.23636:23684]

	layer = calloc(1, sizeof(Layer));
	if (!layer)

[2.23636]

[2.23684]

	layersurface = calloc(1, sizeof(LayerSurface));
	if (!layersurface)

Replacement in dwl.c at line 887 [3.4]

B:BD[2.23695] → [2.23695:23828]

	layer->surface_commit.notify = commitlayernotify;
	wl_signal_add(&layer_surface->surface->events.commit,
		&layer->surface_commit);

[2.23695]

[2.23828]

	layersurface->surface_commit.notify = commitlayernotify;
	wl_signal_add(&wlr_layer_surface->surface->events.commit,
		&layersurface->surface_commit);

Replacement in dwl.c at line 891 [3.4]

B:BD[2.23829] → [2.23829:24135]

	layer->destroy.notify = destroylayernotify;
	wl_signal_add(&layer_surface->events.destroy, &layer->destroy);
	layer->map.notify = maplayernotify;
	wl_signal_add(&layer_surface->events.map, &layer->map);
	layer->unmap.notify = unmaplayernotify;
	wl_signal_add(&layer_surface->events.unmap, &layer->unmap);

[2.23829]

[2.24135]

	layersurface->destroy.notify = destroylayernotify;
	wl_signal_add(&wlr_layer_surface->events.destroy, &layersurface->destroy);
	layersurface->map.notify = maplayernotify;
	wl_signal_add(&wlr_layer_surface->events.map, &layersurface->map);
	layersurface->unmap.notify = unmaplayernotify;
	wl_signal_add(&wlr_layer_surface->events.unmap, &layersurface->unmap);

Replacement in dwl.c at line 898 [3.4]

B:BD[2.24136] → [2.24136:24205]

	layer->layer_surface = layer_surface;
	layer_surface->data = layer;

[2.24136]

[2.24205]

	layersurface->layer_surface = wlr_layer_surface;
	wlr_layer_surface->data = layersurface;

Replacement in dwl.c at line 901 [3.4]
B:BD[2.24206] → [2.24206:24240]
```
	m = layer_surface->output->data;
```
[2.24206]
[2.24240]
```
	m = wlr_layer_surface->output->data;
```

Replacement in dwl.c at line 903 [3.4]

B:BD[2.24241] → [2.24241:24321]

	wl_list_insert(&m->layers[layer_surface->client_pending.layer], &layer->link);

[2.24241]

[2.24321]

	wl_list_insert(&m->layers[wlr_layer_surface->client_pending.layer],
			&layersurface->link);

Replacement in dwl.c at line 908 [3.4]

B:BD[2.24423] → [2.24423:24517]

	old_state = layer_surface->current;
	layer_surface->current = layer_surface->client_pending;

[2.24423]

[2.24517]

	old_state = wlr_layer_surface->current;
	wlr_layer_surface->current = wlr_layer_surface->client_pending;

Replacement in dwl.c at line 911 [3.4]
B:BD[2.24536] → [2.24536:24573]
```
	layer_surface->current = old_state;
```
[2.24536]
[7.8711]
```
	wlr_layer_surface->current = old_state;
```

Replacement in dwl.c at line 953 [3.4]

B:BD[2.24637] → [2.24637:24696]

	Layer *layer = wl_container_of(listener, layer, destroy);

[2.24637]

[2.24696]

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

Replacement in dwl.c at line 956 [3.4]

B:BD[2.24710] → [2.24710:25033]

	if (layer->layer_surface->mapped)
		unmaplayer(layer);
	wl_list_remove(&layer->link);
	wl_list_remove(&layer->destroy.link);
	wl_list_remove(&layer->map.link);
	wl_list_remove(&layer->unmap.link);
	wl_list_remove(&layer->surface_commit.link);
	if (layer->layer_surface->output) {
		m = layer->layer_surface->output->data;

[2.24710]

[2.25033]

	if (layersurface->layer_surface->mapped)
		unmaplayer(layersurface);
	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);
	if (layersurface->layer_surface->output) {
		m = layersurface->layer_surface->output->data;

Replacement in dwl.c at line 967 [3.4]
B:BD[2.25063] → [2.25063:25102]
```
		layer->layer_surface->output = NULL;
```
[2.25063]
[2.25102]
```
		layersurface->layer_surface->output = NULL;
```
Replacement in dwl.c at line 969 [3.4]
B:BD[2.25105] → [2.25105:25119]
```
	free(layer);
```
[2.25105]
[2.25119]
```
	free(layersurface);
```

Replacement in dwl.c at line 1240 [3.4]

B:BD[2.25187] → [2.25187:25328]

	Layer *layer = wl_container_of(listener, layer, map);
	wlr_surface_send_enter(layer->layer_surface->surface, layer->layer_surface->output);

[2.25187]

[2.25328]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, map);
	wlr_surface_send_enter(layersurface->layer_surface->surface, layersurface->layer_surface->output);

Replacement in dwl.c at line 2052 [3.4]
B:BD[2.25501] → [2.25501:25526]
```
unmaplayer(Layer *layer)
```
[2.25501]
[2.25526]
```
unmaplayer(LayerSurface *layersurface)
```

Replacement in dwl.c at line 2083 [3.4]

B:BD[2.25903] → [2.25903:25980]

	Layer *layer = wl_container_of(listener, layer, unmap);
	unmaplayer(layer);

[2.25903]

[2.25980]

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