Sivecano/dwl - Change 5NXELRTS2KF2SZJRXZBJNNDXZG23OSWVUVCIQSPV7TH7T3XKL4PAC

improve type safety of toplevel_from_wlr_surface()

Created by Leonardo Hernández Hernández on December 3, 2022

5NXELRTS2KF2SZJRXZBJNNDXZG23OSWVUVCIQSPV7TH7T3XKL4PAC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 907 [5.4]
B:BD[4.5252] → [4.5252:5264]
```
	Client *c;
```
[4.5252]
[4.5264]
```
	Client *c = NULL;
	LayerSurface *l = NULL;
```

Replacement in dwl.c at line 912 [5.4]

B:BD[4.5343] → [3.5:74]

		LayerSurface *l = toplevel_from_wlr_surface(xdg_surface->surface);

[4.5343]

[4.5404]

		int type = toplevel_from_wlr_surface(xdg_surface->surface, &c, &l);

Replacement in dwl.c at line 917 [5.4]

B:BD[4.5563] → [4.5563:5682]

		/* Probably the check of `l` is useless, the only thing that can be NULL
		 * is its monitor */
		if (!l || !l->mon)

[4.5563]

[4.5682]

		if ((!l || !l->mon) || (!c || !c->mon))

Replacement in dwl.c at line 919 [5.4]

B:BD[4.5693] → [4.5693:5792]

		box = l->type == LayerShell ? l->mon->m : l->mon->w;
		box.x -= l->geom.x;
		box.y -= l->geom.y;

[4.5693]

[4.5792]

		box = type == LayerShell ? l->mon->m : c->mon->w;
		box.x -= (type == LayerShell ? l->geom.x : c->geom.x);
		box.y -= (type == LayerShell ? l->geom.y : c->geom.y);

Replacement in dwl.c at line 1098 [5.4]

B:BD[4.12012] → [3.75:121]

∅:D[3.121] → [4.12056:12445]

B:BD[4.12056] → [4.12056:12445]

		Client *w = toplevel_from_wlr_surface(old);
		if (wlr_surface_is_layer_surface(old)) {
			struct wlr_layer_surface_v1 *wlr_layer_surface =
				wlr_layer_surface_v1_from_wlr_surface(old);
			if (wlr_layer_surface && ((LayerSurface *)wlr_layer_surface->data)->mapped
					&& (wlr_layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP
					|| wlr_layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY))
				return;

[4.12012]

[4.12445]

		Client *w = NULL;
		LayerSurface *l = NULL;
		int type = toplevel_from_wlr_surface(old, &w, &l);
		if (type == LayerShell && l->scene->node.enabled
				&& l->layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
			return;

Replacement in dwl.c at line 1437 [5.4]

B:BD[4.21996] → [4.21996:22033]

	Client *c = NULL;
	LayerSurface *l;

[4.21996]

[4.22033]

	Client *c = NULL, *w = NULL;
	LayerSurface *l = NULL;
	int type;

Replacement in dwl.c at line 1472 [5.4]

B:BD[4.23217] → [3.122:160]

∅:D[3.160] → [4.23261:23307]

B:BD[4.23261] → [4.23261:23307]

		if ((l = toplevel_from_wlr_surface(
				 seat->pointer_state.focused_surface))) {

[4.23217]

[4.23307]

		if ((type = toplevel_from_wlr_surface(
				 seat->pointer_state.focused_surface, &w, &l)) >= 0) {
			c = w;

Replacement in dwl.c at line 1476 [5.4]

B:BD[4.23357] → [4.23357:23419]

			sx = cursor->x - l->geom.x;
			sy = cursor->y - l->geom.y;

[4.23357]

[4.23419]

			sx = cursor->x - (type == LayerShell ? l->geom.x : w->geom.x);
			sy = cursor->y - (type == LayerShell ? l->geom.y : w->geom.y);

Replacement in dwl.c at line 2358 [5.4]

B:BD[4.52185] → [3.161:272]

	Client *c = toplevel_from_wlr_surface(event->surface);
	if (c && c->type != LayerShell && c != selclient()) {

[4.52185]

[4.52269]

	Client *c = NULL;
	int type = toplevel_from_wlr_surface(event->surface, &c, NULL);
	if (type >= 0 && type != LayerShell && c != selclient()) {

Replacement in client.h at line 54 [6.1473]

B:BD[3.280] → [3.280:350]

static inline void *
toplevel_from_wlr_surface(struct wlr_surface *s)

[3.280]

[3.350]

static inline int
toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)

Insertion in client.h at line 60 [6.1473]

[3.470]

	Client *c = NULL;
	LayerSurface *l = NULL;
	int type = -1;

Replacement in client.h at line 68 [6.1473]
B:BD[3.543] → [3.543:558]
```
		return NULL;
```
[3.543]
[3.558]
```
		return type;
```

Replacement in client.h at line 73 [6.1473]

B:BD[3.675] → [3.675:772]

			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(root_surface)))
		return xsurface->data;

[3.675]

[3.772]

			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(root_surface))) {
		c = xsurface->data;
		type = c->type;
		goto end;
	}

Replacement in client.h at line 81 [6.1473]

B:BD[3.828] → [3.828:935]

			&& (layer_surface = wlr_layer_surface_v1_from_wlr_surface(root_surface)))
		return layer_surface->data;

[3.828]

[3.935]

			&& (layer_surface = wlr_layer_surface_v1_from_wlr_surface(root_surface))) {
		l = layer_surface->data;
		type = LayerShell;
		goto end;
	}

Replacement in client.h at line 93 [6.1473]
B:BD[3.1173] → [3.1173:1191]
```
					return NULL;
```
[3.1173]
[3.1191]
```
					return -1;
```

Replacement in client.h at line 95 [6.1473]

B:BD[3.1261] → [3.1261:1328]

					return toplevel_from_wlr_surface(xdg_surface->popup->parent);

[3.1261]

[3.1328]

					return toplevel_from_wlr_surface(xdg_surface->popup->parent, pc, pl);

Replacement in client.h at line 100 [6.1473]

B:BD[3.1459] → [3.1459:1490]

					return xdg_surface->data;

[3.1459]

[3.1490]

				c = xdg_surface->data;
				type = c->type;
				goto end;

Replacement in client.h at line 104 [6.1473]
B:BD[3.1525] → [3.1525:1542]
```
				return NULL;
```
[3.1525]
[3.1542]
```
				return -1;
```
Replacement in client.h at line 109 [6.1473]
B:BD[3.1555] → [3.1555:1569]
```
	return NULL;
```
[3.1555]
[7.1261]
```
end:
	if (pl)
		*pl = l;
	if (pc)
		*pc = c;
	return type;
```
Insertion in client.h at line 188 [6.1473]
[2.63]
[2.63]
```
	Client *p = NULL;
```

Replacement in client.h at line 191 [6.1473]

B:BD[2.133] → [2.133:207]

		return toplevel_from_wlr_surface(c->surface.xwayland->parent->surface);

[2.133]

[2.207]

		toplevel_from_wlr_surface(c->surface.xwayland->parent->surface, &p, NULL);

Replacement in client.h at line 194 [6.1473]

B:BD[2.253] → [2.253:338]

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

[2.253]

[2.338]

		toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL);

Replacement in client.h at line 196 [6.1473]
B:BD[2.339] → [2.339:353]
```
	return NULL;
```
[2.339]
[2.353]
```
	return p;
```