Sivecano/dwl - Change 7UDWES3V56FD5L7VJXSFC6POZ7SXN4Z2JNJQ3XBVN7KBZD6AXTDQC

enable pointer on layer surfaces

Created by Guido Cella on September 4, 2020

7UDWES3V56FD5L7VJXSFC6POZ7SXN4Z2JNJQ3XBVN7KBZD6AXTDQC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 270 [6.4]

[4.48]

[5.1]

static struct wlr_surface *xytolayersurface(struct wl_list *layer_surfaces,
		double x, double y, double *sx, double *sy);

Insertion in dwl.c at line 1239 [6.4]

[7.2960]

	double sx = 0.0, sy = 0.0;
	struct wlr_surface *sub = wlr_layer_surface_v1_surface_at(
			layersurface->layer_surface,
			cursor->x - layersurface->geo.x,
			cursor->y - layersurface->geo.y,
			&sx, &sy);

Replacement in dwl.c at line 1246 [6.4]

B:BD[7.3060] → [3.38:71]

	/* XXX recheck pointer focus */

[7.3060]

[8.25358]

	if (sub)
		wlr_seat_pointer_notify_enter(seat, sub, sx, sy);
	/* XXX check if the layer surface is below a client */

Replacement in dwl.c at line 1319 [6.4]
B:BD[9.1295] → [9.1295:1307]
```
	Client *c;
```
[9.1295]
[9.1307]
```
	Client *c = NULL;
```

Insertion in dwl.c at line 1338 [6.4]

[6.13393]

[10.54]

	if ((surface = xytolayersurface(&selmon->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
					cursor->x, cursor->y, &sx, &sy)))
		;
	else if ((surface = xytolayersurface(&selmon->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
					cursor->x, cursor->y, &sx, &sy)))
		;

Replacement in dwl.c at line 1346 [6.4]

B:BD[11.274] → [11.274:326]

	if ((c = xytoindependent(cursor->x, cursor->y))) {

[11.274]

[11.326]

	else if ((c = xytoindependent(cursor->x, cursor->y))) {

Replacement in dwl.c at line 1352 [6.4]
B:BD[12.3119] → [2.1:9]
```
	} else
```
[12.3119]
[2.9]
```
	}
```
Replacement in dwl.c at line 1354 [6.4]
∅:D[2.16] → [10.79:126]
B:BD[10.79] → [10.79:126]
```
	if ((c = xytoclient(cursor->x, cursor->y))) {
```
[2.16]
[13.1312]
```
	else if ((c = xytoclient(cursor->x, cursor->y))) {
```

Insertion in dwl.c at line 1365 [6.4]

[14.3007]

	}
	else if ((surface = xytolayersurface(&selmon->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
					cursor->x, cursor->y, &sx, &sy)))
		;
	else if ((surface = xytolayersurface(&selmon->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
					cursor->x, cursor->y, &sx, &sy))) { // gcc complains without these braces
		;

Insertion in dwl.c at line 1449 [6.4]
[15.451]
[10.134]
```
	if (!c)
		return;
```

Insertion in dwl.c at line 2155 [6.4]

[11.591]

[5.182]

struct wlr_surface *
xytolayersurface(struct wl_list *layer_surfaces, double x, double y,
		double *sx, double *sy)
{
	LayerSurface *layersurface;
	wl_list_for_each_reverse(layersurface, layer_surfaces, link) {
		struct wlr_surface *sub = wlr_layer_surface_v1_surface_at(
				layersurface->layer_surface,
				x - layersurface->geo.x,
				y - layersurface->geo.y,
				sx, sy);
		if (sub)
			return sub;
	}
	return NULL;
}