Sivecano/dwl - Change WM43HOHUSZWK5OOCFHSOKA2PNUL45ZQENVPHNHWETSQQ7BAKHG7AC

merge toplevel_from_{wlr_layer_surface,popup} into client_from_wlr_surface

now it is a big function called toplevel_from_wlr_surface

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

WM43HOHUSZWK5OOCFHSOKA2PNUL45ZQENVPHNHWETSQQ7BAKHG7AC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 911 [4.4]

B:BD[3.5343] → [3.5343:5404]

		LayerSurface *l = toplevel_from_popup(xdg_surface->popup);

[3.5343]

[3.5404]

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

Replacement in dwl.c at line 1099 [4.4]

B:BD[3.12012] → [3.12012:12056]

		Client *w = client_from_wlr_surface(old);

[3.12012]

[3.12056]

		Client *w = toplevel_from_wlr_surface(old);

Replacement in dwl.c at line 1475 [4.4]
B:BD[3.23217] → [3.23217:23261]
```
		if ((l = toplevel_from_wlr_layer_surface(
```
[3.23217]
[3.23261]
```
		if ((l = toplevel_from_wlr_surface(
```

Replacement in dwl.c at line 2360 [4.4]

B:BD[3.52185] → [3.52185:52269]

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

[3.52185]

[3.52269]

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

Deletion in client.h at line 19 [6.1473]

B:BD[5.293] → [5.293:399]

∅:D[2.39] → [5.399:767]

B:BD[5.399] → [5.399:767]

B:BD[5.767] → [2.40:147]

B:BD[7.345] → [7.345:362]

static inline Client *
client_from_wlr_surface(struct wlr_surface *s)
{
	struct wlr_xdg_surface *surface;
#ifdef XWAYLAND
	struct wlr_xwayland_surface *xsurface;
	if (s && wlr_surface_is_xwayland_surface(s)
			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s)))
		return xsurface->data;
#endif
	if (s && wlr_surface_is_xdg_surface(s)
			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
		return surface->data;
	if (s && wlr_surface_is_subsurface(s))
		return client_from_wlr_surface(wlr_surface_get_root_surface(s));
	return NULL;
}

Insertion in client.h at line 52 [6.1473]

[7.1261]

}
static inline void *
toplevel_from_wlr_surface(struct wlr_surface *s)
{
	struct wlr_xdg_surface *xdg_surface;
	struct wlr_surface *root_surface;
	struct wlr_layer_surface_v1 *layer_surface;
#ifdef XWAYLAND
	struct wlr_xwayland_surface *xsurface;
#endif
	if (!s)
		return NULL;
	root_surface = wlr_surface_get_root_surface(s);
#ifdef XWAYLAND
	if (wlr_surface_is_xwayland_surface(root_surface)
			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(root_surface)))
		return xsurface->data;
#endif
	if (wlr_surface_is_layer_surface(root_surface)
			&& (layer_surface = wlr_layer_surface_v1_from_wlr_surface(root_surface)))
		return layer_surface->data;
	if (wlr_surface_is_xdg_surface(root_surface)
			&& (xdg_surface = wlr_xdg_surface_from_wlr_surface(root_surface))) {
		while (1) {
			switch (xdg_surface->role) {
			case WLR_XDG_SURFACE_ROLE_POPUP:
				if (!xdg_surface->popup->parent)
					return NULL;
				else if (!wlr_surface_is_xdg_surface(xdg_surface->popup->parent))
					return toplevel_from_wlr_surface(xdg_surface->popup->parent);
				xdg_surface = wlr_xdg_surface_from_wlr_surface(xdg_surface->popup->parent);
				break;
			case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
					return xdg_surface->data;
			case WLR_XDG_SURFACE_ROLE_NONE:
				return NULL;
			}
		}
	}
	return NULL;

Deletion in client.h at line 348 [6.1473]

∅:D[8.497] → [9.254:257]

∅:D[7.1697] → [9.254:257]

B:BD[9.254] → [9.254:257]

B:BD[9.257] → [10.658:728]

∅:D[10.728] → [11.386:512]

B:BD[11.386] → [11.386:512]

B:BD[11.512] → [12.56:171]

∅:D[12.171] → [10.790:935]

B:BD[10.790] → [10.790:935]

∅:D[10.935] → [11.572:792]

B:BD[11.572] → [11.572:792]

}
static inline void *
toplevel_from_popup(struct wlr_xdg_popup *popup)
{
	struct wlr_xdg_surface *surface = popup->base;
	while (1) {
		switch (surface->role) {
		case WLR_XDG_SURFACE_ROLE_POPUP:
			if (!surface->popup->parent)
				return NULL;
			else if (wlr_surface_is_layer_surface(surface->popup->parent))
				return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
			else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
				return NULL;
			surface = wlr_xdg_surface_from_wlr_surface(surface->popup->parent);
			break;
		case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
				return surface->data;
		case WLR_XDG_SURFACE_ROLE_NONE:
			return NULL;
		}
	}

Deletion in client.h at line 349 [6.1473]

B:BD[11.794] → [13.236:596]


static inline void *
toplevel_from_wlr_layer_surface(struct wlr_surface *s)
{
	Client *c;
	struct wlr_layer_surface_v1 *wlr_layer_surface;
	if ((c = client_from_wlr_surface(s)))
		return c;
	else if (s && wlr_surface_is_layer_surface(s)
			&& (wlr_layer_surface = wlr_layer_surface_v1_from_wlr_surface(s)))
		return wlr_layer_surface->data;
	return NULL;
}