Sivecano/dwl - Change T65KVJWUY3RYRWBFG5DP4V4NID4VO3MM6IOFYPM2IJKR6NCD7YDQC

use scene layer shell helper

Created by Leonardo Hernandez Hernandez on February 13, 2022

T65KVJWUY3RYRWBFG5DP4V4NID4VO3MM6IOFYPM2IJKR6NCD7YDQC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 147 [8.4]

[6.273]

[7.14553]

	struct wlr_scene_layer_surface_v1 *scene_layer;

Deletion in dwl.c at line 155 [8.4]
B:BD[7.14693] → [7.14693:14715]
```
	struct wlr_box geo;
```

Deletion in dwl.c at line 156 [8.4]

B:BD[9.19] → [10.4:138]


typedef struct {
	uint32_t singular_anchor;
	uint32_t anchor_triplet;
	int *positive_axis;
	int *negative_axis;
	int margin;
} Edge;

Deletion in dwl.c at line 200 [8.4]

B:BD[11.59] → [7.14825:15008]

static void applyexclusive(struct wlr_box *usable_area, uint32_t anchor,
		int32_t exclusive, int32_t margin_top, int32_t margin_right,
		int32_t margin_bottom, int32_t margin_left);

Deletion in dwl.c at line 375 [8.4]

∅:D[12.495] → [11.554:562]

B:BD[11.554] → [11.554:562]

B:BD[11.562] → [7.15681:15855]

B:BD[7.15855] → [13.4:1273]

B:BD[13.1273] → [2.4:50]

∅:D[14.49] → [15.3:83]

∅:D[2.50] → [15.3:83]

∅:D[16.55] → [15.3:83]

B:BD[7.17399] → [15.3:83]

∅:D[15.83] → [7.17480:17721]

B:BD[7.17480] → [7.17480:17721]

}
void
applyexclusive(struct wlr_box *usable_area,
		uint32_t anchor, int32_t exclusive,
		int32_t margin_top, int32_t margin_right,
		int32_t margin_bottom, int32_t margin_left) {
	Edge edges[] = {
		{ // Top
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
			.anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
			.positive_axis = &usable_area->y,
			.negative_axis = &usable_area->height,
			.margin = margin_top,
		},
		{ // Bottom
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = NULL,
			.negative_axis = &usable_area->height,
			.margin = margin_bottom,
		},
		{ // Left
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT,
			.anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = &usable_area->x,
			.negative_axis = &usable_area->width,
			.margin = margin_left,
		},
		{ // Right
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
			.anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = NULL,
			.negative_axis = &usable_area->width,
			.margin = margin_right,
		}
	};
	for (size_t i = 0; i < LENGTH(edges); i++) {
		if ((anchor == edges[i].singular_anchor || anchor == edges[i].anchor_triplet)
				&& exclusive + edges[i].margin > 0) {
			if (edges[i].positive_axis)
				*edges[i].positive_axis += exclusive + edges[i].margin;
			if (edges[i].negative_axis)
				*edges[i].negative_axis -= exclusive + edges[i].margin;
			break;
		}
	}

Deletion in dwl.c at line 428 [8.4]

B:BD[9.353] → [10.1556:1581]

∅:D[10.1581] → [7.18167:18266]

B:BD[7.18167] → [7.18167:18266]

B:BD[7.18266] → [10.1582:1791]

		struct wlr_box bounds;
		struct wlr_box box = {
			.width = state->desired_width,
			.height = state->desired_height
		};
		const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
		const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;

Replacement in dwl.c at line 432 [8.4]

B:BD[7.18538] → [10.1792:1859]

∅:D[17.1518] → [7.18605:18627]

∅:D[10.1859] → [7.18605:18627]

B:BD[7.18605] → [7.18605:18627]

∅:D[17.1624] → [7.18627:19037]

B:BD[7.18627] → [7.18627:19037]

∅:D[17.1729] → [7.19037:20181]

B:BD[7.19037] → [7.19037:20181]

B:BD[7.20181] → [3.4:56]

∅:D[3.56] → [7.20227:20244]

∅:D[9.404] → [7.20227:20244]

B:BD[7.20227] → [7.20227:20244]

B:BD[7.20244] → [9.405:432]

∅:D[9.432] → [7.20264:20265]

B:BD[7.20264] → [7.20264:20265]

B:BD[7.20265] → [13.1274:1469]

B:BD[13.1469] → [6.747:813]

∅:D[6.813] → [9.433:509]

∅:D[13.1469] → [9.433:509]

B:BD[7.20424] → [9.433:509]

		bounds = state->exclusive_zone == -1 ? full_area : *usable_area;
		// Horizontal axis
		if ((state->anchor & both_horiz) && box.width == 0) {
			box.x = bounds.x;
			box.width = bounds.width;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
			box.x = bounds.x;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
			box.x = bounds.x + (bounds.width - box.width);
		} else {
			box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
		}
		// Vertical axis
		if ((state->anchor & both_vert) && box.height == 0) {
			box.y = bounds.y;
			box.height = bounds.height;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
			box.y = bounds.y;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
			box.y = bounds.y + (bounds.height - box.height);
		} else {
			box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
		}
		// Margin
		if ((state->anchor & both_horiz) == both_horiz) {
			box.x += state->margin.left;
			box.width -= state->margin.left + state->margin.right;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
			box.x += state->margin.left;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
			box.x -= state->margin.right;
		}
		if ((state->anchor & both_vert) == both_vert) {
			box.y += state->margin.top;
			box.height -= state->margin.top + state->margin.bottom;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
			box.y += state->margin.top;
		} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
			box.y -= state->margin.bottom;
		}
		if (box.width < 0 || box.height < 0) {
			wlr_layer_surface_v1_destroy(wlr_layer_surface);
			continue;
		}
		layersurface->geo = box;
		if (state->exclusive_zone > 0)
			applyexclusive(usable_area, state->anchor, state->exclusive_zone,
					state->margin.top, state->margin.right,
					state->margin.bottom, state->margin.left);
		wlr_scene_node_set_position(layersurface->scene, box.x, box.y);
		wlr_layer_surface_v1_configure(wlr_layer_surface, box.width, box.height);

[7.18538]

[7.20496]

		wlr_scene_layer_surface_v1_configure(layersurface->scene_layer, &full_area, usable_area);

Replacement in dwl.c at line 791 [8.4]

B:BD[7.24241] → [18.4:61]

B:BD[18.61] → [5.4:49]

∅:D[5.49] → [6.1125:1157]

∅:D[6.1125] → [6.1125:1157]

B:BD[6.1125] → [6.1125:1157]

	layersurface->scene = wlr_scene_subsurface_tree_create(
			layers[wlr_layer_surface->pending.layer],
			wlr_layer_surface->surface);

[7.24241]

[6.1157]

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