Sivecano/dwl - Change NWKV3CJZDJGETIBG7P2QHOQVHSEK5J2YZAYKL4OVWZEIWHK6LINAC

Separate drag icon from layers array and Lyr enum

If we treat the drag icon as distinct from other layers (it doesn't have contents that are interactive, focusable, etc.), then we can iterate over layers meaningfully with a simple for loop.

ΔSLOC: -8

Created by Devin J. Pohly on June 25, 2023

NWKV3CJZDJGETIBG7P2QHOQVHSEK5J2YZAYKL4OVWZEIWHK6LINAC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 77 [6.4]

B:BD[4.80] → [5.49:176]

enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrFS, LyrDragIcon, LyrBlock, NUM_LAYERS }; /* scene layers */

[4.80]

[7.1]

enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrFS, LyrTop, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */

Insertion in dwl.c at line 333 [6.4]

[8.161]

[9.484]

/* Map from ZWLR_LAYER_SHELL_* constants to Lyr* enum */
static const int layermap[] = { LyrBg, LyrBottom, LyrTop, LyrOverlay };

Insertion in dwl.c at line 741 [6.4]

[10.331]

[11.7]

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

Replacement in dwl.c at line 748 [6.4]

B:BD[12.887] → [13.187:326]

∅:D[13.326] → [14.151:198]

B:BD[14.151] → [14.151:198]

B:BD[14.198] → [15.163:218]

∅:D[15.218] → [16.154:201]

B:BD[16.154] → [16.154:201]

	if (layers[wlr_layer_surface->current.layer] != layersurface->scene->node.parent) {
		wlr_scene_node_reparent(&layersurface->scene->node,
				layers[wlr_layer_surface->current.layer]);
		wlr_scene_node_reparent(&layersurface->popups->node,
				layers[wlr_layer_surface->current.layer]);

[12.887]

[14.198]

	if (layer != layersurface->scene->node.parent) {
		wlr_scene_node_reparent(&layersurface->scene->node, layer);
		wlr_scene_node_reparent(&layersurface->popups->node, layer);

Insertion in dwl.c at line 836 [6.4]

[17.1104]

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

Replacement in dwl.c at line 861 [6.4]

B:BD[17.1913] → [17.1913:2042]

	layersurface->scene_layer = wlr_scene_layer_surface_v1_create(
			layers[wlr_layer_surface->pending.layer], wlr_layer_surface);

[17.1913]

[17.2042]

	layersurface->scene_layer = wlr_scene_layer_surface_v1_create(l, wlr_layer_surface);

Replacement in dwl.c at line 863 [6.4]

B:BD[17.2098] → [17.2098:2157]

B:BD[17.2157] → [2.5:73]

	layersurface->popups = wlr_layer_surface->surface->data =
			wlr_scene_tree_create(layers[wlr_layer_surface->pending.layer]);

[17.2098]

[17.2232]

	layersurface->popups = wlr_layer_surface->surface->data = wlr_scene_tree_create(l);

Insertion in dwl.c at line 2130 [6.4]
[17.38419]
[3.39]
```
	int layer;
```

Replacement in dwl.c at line 2158 [6.4]

B:BD[17.39535] → [17.39535:39760]

B:BD[17.39760] → [18.954:1008]

∅:D[18.1008] → [17.39760:39934]

B:BD[17.39760] → [17.39760:39934]

B:BD[17.39934] → [5.4537:4594]

	layers[LyrBg] = wlr_scene_tree_create(&scene->tree);
	layers[LyrBottom] = wlr_scene_tree_create(&scene->tree);
	layers[LyrTile] = wlr_scene_tree_create(&scene->tree);
	layers[LyrFloat] = wlr_scene_tree_create(&scene->tree);
	layers[LyrFS] = wlr_scene_tree_create(&scene->tree);
	layers[LyrTop] = wlr_scene_tree_create(&scene->tree);
	layers[LyrOverlay] = wlr_scene_tree_create(&scene->tree);
	layers[LyrDragIcon] = wlr_scene_tree_create(&scene->tree);
	layers[LyrBlock] = wlr_scene_tree_create(&scene->tree);

[17.39535]

[17.39934]

	for (layer = 0; layer < NUM_LAYERS; layer++)
		layers[layer] = wlr_scene_tree_create(&scene->tree);

Insertion in dwl.c at line 2348 [6.4]
[17.46153]
[17.46153]
```
	struct wlr_scene_tree *icon;
```

Replacement in dwl.c at line 2353 [6.4]

B:BD[17.46183] → [17.46183:46279]

	drag->icon->data = wlr_scene_subsurface_tree_create(layers[LyrDragIcon], drag->icon->surface);

[17.46183]

[17.46279]

	drag->icon->data = icon = wlr_scene_subsurface_tree_create(&scene->tree, drag->icon->surface);
	wlr_scene_node_place_below(&icon->node, &layers[LyrBlock]->node);

Replacement in dwl.c at line 2652 [6.4]

B:BD[17.53183] → [17.53183:53202]

B:BD[17.53202] → [5.5624:5723]

	const int *layer;
	int focus_order[] = { LyrBlock, LyrOverlay, LyrTop, LyrFS, LyrFloat, LyrTile, LyrBottom, LyrBg };

[17.53183]

[17.53284]

	int layer;
	for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) {
		if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny)))
			continue;

Replacement in dwl.c at line 2658 [6.4]

B:BD[17.53285] → [17.53285:53784]

	for (layer = focus_order; layer < END(focus_order); layer++) {
		if ((node = wlr_scene_node_at(&layers[*layer]->node, x, y, nx, ny))) {
			if (node->type == WLR_SCENE_NODE_BUFFER)
				surface = wlr_scene_surface_from_buffer(
						wlr_scene_buffer_from_node(node))->surface;
			/* Walk the tree to find a node that knows the client */
			for (pnode = node; pnode && !c; pnode = &pnode->parent->node)
				c = pnode->data;
			if (c && c->type == LayerShell) {
				c = NULL;
				l = pnode->data;
			}

[17.53285]

[17.53784]

		if (node->type == WLR_SCENE_NODE_BUFFER)
			surface = wlr_scene_surface_from_buffer(
					wlr_scene_buffer_from_node(node))->surface;
		/* Walk the tree to find a node that knows the client */
		for (pnode = node; pnode && !c; pnode = &pnode->parent->node)
			c = pnode->data;
		if (c && c->type == LayerShell) {
			c = NULL;
			l = pnode->data;

Deletion in dwl.c at line 2668 [6.4]
B:BD[17.53788] → [17.53788:53813]
```
		if (surface)
			break;
```