Sivecano/dwl - Change BE2WICFCSLQ4BYXGGLGJ5WNVX554FZDXI26MZCLIY46W4M7HVGEAC

simplify client_for_each_surface

All the XDG surface iterator does is iterate the main wlr_surface, then iterate the popups. If we inline that function, we can merge part of it with the X11 case.

Created by Devin J. Pohly on September 5, 2021

BE2WICFCSLQ4BYXGGLGJ5WNVX554FZDXI26MZCLIY46W4M7HVGEAC

Dependencies

[2] 2GP4MXKEDQMZ7E6TCRSMV2AGN7HLEAHR3QEAC2QFCQQNPMNJSIHQC

In channels

main

Change contents

Replacement in client.h at line 8 [2.1473]

B:BD[2.1795] → [2.1795:1852]

/* Leave this function first; it's used in the others */

[2.1795]

[2.1852]

/* Leave these functions first; they're used in the others */

Insertion in client.h at line 19 [2.1473]

[2.1998]

static inline struct wlr_surface *
client_surface(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->surface;
#endif
	return c->surface.xdg->surface;
}

Insertion in client.h at line 48 [2.1473]

[2.2494]

	wlr_surface_for_each_surface(client_surface(c), fn, data);

Replacement in client.h at line 50 [2.1473]

B:BD[2.2510] → [2.2510:2611]

	if (client_is_x11(c)) {
		wlr_surface_for_each_surface(c->surface.xwayland->surface,
				fn, data);

[2.2510]

[2.2611]

	if (client_is_x11(c))

Deletion in client.h at line 52 [2.1473]
B:BD[2.2621] → [2.2621:2624]
```
	}
```

Replacement in client.h at line 53 [2.1473]

B:BD[2.2631] → [2.2631:2692]

	wlr_xdg_surface_for_each_surface(c->surface.xdg, fn, data);

[2.2631]

[2.2692]

	wlr_xdg_surface_for_each_popup_surface(c->surface.xdg, fn, data);

Deletion in client.h at line 164 [2.1473]

B:BD[2.4873] → [2.4873:5057]

client_surface(Client *c)
{
#ifdef XWAYLAND
	if (client_is_x11(c))
		return c->surface.xwayland->surface;
#endif
	return c->surface.xdg->surface;
}
static inline struct wlr_surface *