Sivecano/dwl - Change QKVRBSFOOQUQMZ3P7CMPA7QCVQW5TXAKWH6NDL3K7Q3Z4GMXOVPQC

Merge remote-tracking branch 'djpohly/main' into wlroots-next

Created by Leonardo Hernández Hernández on October 1, 2022

QKVRBSFOOQUQMZ3P7CMPA7QCVQW5TXAKWH6NDL3K7Q3Z4GMXOVPQC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 212 [13.4]

[12.40]

static void checkidleinhibitor(struct wlr_surface *exclude);

Deletion in dwl.c at line 441 [13.4]

B:BD[14.683] → [15.250:319]

		wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, c->mon));

Replacement in dwl.c at line 442 [13.4]

B:BD[4.25] → [4.25:83]

			wlr_scene_node_set_enabled(c->scene, VISIBLEON(c, m));

[4.25]

[14.745]

			wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, m));

Deletion in dwl.c at line 630 [13.4]

B:BD[16.171] → [2.7:67]

	Keyboard *kb = wlr_keyboard_from_input_device(data)->data;

Replacement in dwl.c at line 673 [13.4]

B:BD[17.385] → [18.264:295]

			setmon(c, selmon, c->tags);

[17.385]

[19.520]

			setmon(c, selmon == m ? NULL : selmon, c->tags);

Replacement in dwl.c at line 690 [13.4]

B:BD[14.887] → [15.320:373]

BD:BD[14.887] → [15.320:373]

B:BD[14.887] → [5.6:86]

∅:D[5.86] → [21.104:151]

B:BD[21.104] → [21.104:151]

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

[14.887]

[21.151]

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

Replacement in dwl.c at line 730 [13.4]
B:BD[12.718] → [12.718:756]
```
	wlr_idle_set_enabled(idle, seat, 0);
```
[12.718]
[12.756]
```
	checkidleinhibitor(NULL);
```
Resurrecting zombie bytes in dwl.c at line 992 [13.4]
B:B[22.2721] → [3.118:171]
BD:B[22.2721] → [3.118:171]
```
	wlr_scene_node_destroy(&layersurface->scene->node);
```
Insertion in dwl.c at line 1319 [13.4]
[23.115]
[15.604]
```
		/* Unmanaged clients always are floating */
```
Deletion in dwl.c at line 1343 [13.4]
B:BD[24.1062] → [25.60:149]
BD:BD[24.1062] → [25.60:149]
```
	if ((p = client_get_parent(c))) {
		/* Set the same monitor and tags than its parent */
```

Replacement in dwl.c at line 1347 [13.4]

B:BD[8.228] → [8.228:286]

	if ((p = client_get_parent(c)) && client_is_mapped(p)) {

[8.228]

[25.149]

	if ((p = client_get_parent(c))) {

Resurrecting zombie bytes in dwl.c at line 1349 [13.4]
B:B[25.170] → [3.290:352]
BD:B[25.170] → [3.290:352]
```
		wlr_scene_node_reparent(&c->scene->node, layers[LyrFloat]);
```
Deletion in dwl.c at line 1350 [13.4]
∅:D[3.352] → [26.7:119]
B:BD[25.225] → [26.7:119]
BD:BD[25.225] → [26.7:119]
```
		/* TODO recheck if !p->mon is possible with wlroots 0.16.0 */
		setmon(c, p->mon ? p->mon : selmon, p->tags);
```
Resurrecting zombie bytes in dwl.c at line 1350 [13.4]
B:B[25.225] → [8.287:317]
BD:B[25.225] → [8.287:317]
```
		setmon(c, p->mon, p->tags);
```
Solving an order conflict in dwl.c at line 1350 [13.4]
[3.352]
[8.287]

Resurrecting zombie bytes in dwl.c at line 2250 [13.4]

B:B[27.125] → [11.6:70]

BD:B[27.125] → [11.6:70]

∅:∅[11.70] → [28.394:542]

B:B[27.125] → [28.394:542]

BD:B[27.125] → [28.394:542]

	if (layersurface == exclusive_focus)
		exclusive_focus = NULL;
	if (layersurface->layer_surface->output
			&& (layersurface->mon = layersurface->layer_surface->output->data))
		arrangelayers(layersurface->mon);

Insertion in dwl.c at line 2250 [13.4]

[29.25528]

[11.6]

	LayerSurface *layersurface = wl_container_of(listener, layersurface, unmap);
	layersurface->mapped = 0;
	wlr_scene_node_set_enabled(&layersurface->scene->node, 0);

Resurrecting zombie bytes in dwl.c at line 2274 [13.4]
B:B[30.672] → [30.672:673]
BD:B[30.672] → [30.672:673]
Deletion in dwl.c at line 2278 [13.4]
B:BD[31.35] → [15.1362:1405]
BD:BD[31.35] → [15.1362:1405]
```
		wlr_scene_node_destroy(&c->scene->node);
```
Insertion in dwl.c at line 2284 [13.4]
[32.521]
[3.791]
```
end:
```
Deletion in dwl.c at line 2374 [13.4]
B:BD[33.651] → [6.6:48]
```
	createkeyboard(&keyboard->input_device);
```
Solving an order conflict in dwl.c at line 2374 [13.4]
[2.222]
[33.736]
Deletion in dwl.c at line 2599 [13.4]
∅:D[34.61] → [12.1001:1001]
B:BD[35.1448] → [12.1001:1001]
B:BD[32.521] → [9.48:54]
BD:BD[32.521] → [9.48:54]
B:BD[29.25528] → [36.74:153]
B:BD[37.74] → [3.730:790]
BD:BD[37.74] → [3.730:790]
B:BD[36.153] → [38.141:168]
BD:BD[36.153] → [38.141:168]
B:BD[23.115] → [7.1165:1211]
BD:BD[23.115] → [7.1165:1211]
B:BD[39.625] → [40.526:553]
BD:BD[39.625] → [40.526:553]
```
end:
	LayerSurface *layersurface = wl_container_of(listener, layersurface, unmap);
	wlr_scene_node_set_enabled(&layersurface->scene->node, 0);
	layersurface->mapped = 0;
		/* Unmanaged clients always are floating */
	checkidleinhibitor(NULL);
```
Solving an order conflict in dwl.c at line 2599 [13.4]
[34.61]
[39.663]
Deletion in dwl.c at line 2600 [13.4]
B:BD[39.665] → [3.827:827]
B:BD[29.15855] → [10.6:17]
BD:BD[29.15855] → [10.6:17]
B:BD[42.1273] → [10.18:57]
BD:BD[42.1273] → [10.18:57]
B:BD[43.35] → [40.6:67]
BD:BD[43.35] → [40.6:67]
```
	size_t i;
	for (i = 0; i < LENGTH(edges); i++) {
static void checkidleinhibitor(struct wlr_surface *exclude);
```
Solving an order conflict in dwl.c at line 2600 [13.4]
[39.665]

Replacement in client.h at line 48 [45.1473]

B:BD[44.267] → [44.267:344]

		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->surface);

[44.267]

[44.344]

		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface);

Replacement in client.h at line 60 [45.1473]

B:BD[44.574] → [44.574:676]

		struct wlr_xwayland_surface_size_hints *size_hints;
		size_hints = c->surface.xwayland->size_hints;

[44.574]

[44.676]

		xcb_size_hints_t *size_hints = c->surface.xwayland->size_hints;

Deletion in client.h at line 154 [45.1473]
B:BD[46.672] → [3.832:898]
BD:BD[46.672] → [3.832:898]
```
		xcb_size_hints_t *size_hints = c->surface.xwayland->size_hints;
```

Deletion in client.h at line 165 [45.1473]

B:BD[25.1039] → [3.899:982]

		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface);

Deletion in client.h at line 166 [45.1473]
B:BD[45.3416] → [45.3416:3417]

Merge remote-tracking branch 'djpohly/main' into wlroots-next

Dependencies

In channels

Change contents

Insertion in dwl.c at line 212 [13.4]

Deletion in dwl.c at line 441 [13.4]

Replacement in dwl.c at line 442 [13.4]

Deletion in dwl.c at line 630 [13.4]

Replacement in dwl.c at line 673 [13.4]

Replacement in dwl.c at line 690 [13.4]

Replacement in dwl.c at line 730 [13.4]

Resurrecting zombie bytes in dwl.c at line 992 [13.4]

Insertion in dwl.c at line 1319 [13.4]

Deletion in dwl.c at line 1343 [13.4]

Replacement in dwl.c at line 1347 [13.4]

Resurrecting zombie bytes in dwl.c at line 1349 [13.4]

Deletion in dwl.c at line 1350 [13.4]

Resurrecting zombie bytes in dwl.c at line 1350 [13.4]

Solving an order conflict in dwl.c at line 1350 [13.4]

Resurrecting zombie bytes in dwl.c at line 2250 [13.4]

Insertion in dwl.c at line 2250 [13.4]

Resurrecting zombie bytes in dwl.c at line 2274 [13.4]

Deletion in dwl.c at line 2278 [13.4]

Insertion in dwl.c at line 2284 [13.4]

Deletion in dwl.c at line 2374 [13.4]

Solving an order conflict in dwl.c at line 2374 [13.4]

Deletion in dwl.c at line 2599 [13.4]

Solving an order conflict in dwl.c at line 2599 [13.4]

Deletion in dwl.c at line 2600 [13.4]

Solving an order conflict in dwl.c at line 2600 [13.4]

Replacement in client.h at line 48 [45.1473]

Replacement in client.h at line 60 [45.1473]

Deletion in client.h at line 154 [45.1473]

Deletion in client.h at line 165 [45.1473]

Deletion in client.h at line 166 [45.1473]