Sivecano/dwl - Change 4IA7K77KPR33PP6IKI6OQ2OXMCHCAZZXNYNQXETE6TJQQ6F6CM3QC

chase wlroots!4288

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4288

Created by Leonardo Hernández Hernández on August 21, 2023

4IA7K77KPR33PP6IKI6OQ2OXMCHCAZZXNYNQXETE6TJQQ6F6CM3QC

Dependencies

In channels

main

Change contents

Replacement in client.h at line 57 [4.1473]

B:BD[3.352] → [3.352:390]

	struct wlr_xdg_surface *xdg_surface;

[3.352]

[3.390]

	struct wlr_xdg_surface *xdg_surface, *tmp_xdg_surface;

Replacement in client.h at line 85 [4.1473]

B:BD[3.936] → [2.92:167]

∅:D[2.167] → [3.1054:1173]

B:BD[3.1054] → [3.1054:1173]

B:BD[3.1173] → [5.1478:1494]

B:BD[5.1494] → [2.168:248]

∅:D[2.248] → [5.1495:1570]

B:BD[3.1261] → [5.1495:1570]

	if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(root_surface))) {
		while (1) {
			switch (xdg_surface->role) {
			case WLR_XDG_SURFACE_ROLE_POPUP:
				if (!xdg_surface->popup->parent)
					return -1;
				else if (!wlr_xdg_surface_try_from_wlr_surface(xdg_surface->popup->parent))
					return toplevel_from_wlr_surface(xdg_surface->popup->parent, pc, pl);

[3.936]

[3.1328]

	xdg_surface = wlr_xdg_surface_try_from_wlr_surface(root_surface);
	while (xdg_surface) {
		tmp_xdg_surface = NULL;
		switch (xdg_surface->role) {
		case WLR_XDG_SURFACE_ROLE_POPUP:
			if (!xdg_surface->popup || !xdg_surface->popup->parent)
				return -1;
			tmp_xdg_surface = wlr_xdg_surface_try_from_wlr_surface(xdg_surface->popup->parent);
			if (!tmp_xdg_surface)
				return toplevel_from_wlr_surface(xdg_surface->popup->parent, pc, pl);

Replacement in client.h at line 98 [4.1473]

B:BD[3.1329] → [2.249:333]

∅:D[2.333] → [3.1409:1459]

B:BD[3.1409] → [3.1409:1459]

B:BD[3.1459] → [5.1571:1632]

∅:D[5.1632] → [3.1490:1525]

B:BD[3.1490] → [3.1490:1525]

B:BD[3.1525] → [5.1633:1648]

∅:D[5.1648] → [3.1542:1547]

B:BD[3.1542] → [3.1542:1547]

				xdg_surface = wlr_xdg_surface_try_from_wlr_surface(xdg_surface->popup->parent);
				break;
			case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
				c = xdg_surface->data;
				type = c->type;
				goto end;
			case WLR_XDG_SURFACE_ROLE_NONE:
				return -1;
			}

[3.1329]

[3.1547]

			xdg_surface = tmp_xdg_surface;
			break;
		case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
			c = xdg_surface->data;
			type = c->type;
			goto end;
		case WLR_XDG_SURFACE_ROLE_NONE:
			return -1;