Sivecano/dwl - Change OKQDKOVUGULJA6E4XL4VMUHPT4IOFYBFBJAU7QXNNPP6PJ4DYLVAC

C99 doesn't support anonymous unions

I'm cool with ->surface.xdg instead of ->xdg_surface though.

Created by Devin J. Pohly on August 2, 2020

OKQDKOVUGULJA6E4XL4VMUHPT4IOFYBFBJAU7QXNNPP6PJ4DYLVAC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 46 [9.4]

B:BD[7.153] → [8.1:118]

#define WLR_SURFACE(C)          ((C)->type != XDGShell ? (C)->xwayland_surface->surface : (C)->xdg_surface->surface)

[7.153]

[9.814]

#define WLR_SURFACE(C)          ((C)->type != XDGShell ? (C)->surface.xwayland->surface : (C)->surface.xdg->surface)

Replacement in dwl.c at line 74 [9.4]

B:BD[10.138] → [10.138:230]

		struct wlr_xdg_surface *xdg_surface;
		struct wlr_xwayland_surface *xwayland_surface;
	};

[10.138]

[11.155]

		struct wlr_xdg_surface *xdg;
		struct wlr_xwayland_surface *xwayland;
	} surface;

Replacement in dwl.c at line 288 [9.4]

∅:D[12.35] → [11.860:930]

B:BD[11.860] → [11.860:930]

               wlr_xwayland_surface_activate(c->xwayland_surface, 1);

[12.35]

[11.930]

               wlr_xwayland_surface_activate(c->surface.xwayland, 1);

Replacement in dwl.c at line 318 [9.4]

B:BD[13.392] → [8.119:179]

∅:D[8.179] → [14.164:200]

B:BD[14.164] → [14.164:200]

B:BD[14.200] → [8.180:240]

∅:D[8.240] → [14.249:284]

B:BD[14.249] → [14.249:284]

	appid = c->type != XDGShell ? c->xwayland_surface->class :
		c->xdg_surface->toplevel->app_id;
	title = c->type != XDGShell ? c->xwayland_surface->title :
		c->xdg_surface->toplevel->title;

[13.392]

[15.170]

	appid = c->type != XDGShell ? c->surface.xwayland->class :
		c->surface.xdg->toplevel->app_id;
	title = c->type != XDGShell ? c->surface.xwayland->title :
		c->surface.xdg->toplevel->title;

Replacement in dwl.c at line 380 [9.4]

∅:D[8.269] → [14.302:369]

B:BD[14.302] → [14.302:369]

				surface = wlr_surface_surface_at(c->xwayland_surface->surface,

[8.269]

[10.938]

				surface = wlr_surface_surface_at(c->surface.xwayland->surface,

Replacement in dwl.c at line 384 [9.4]

B:BD[10.1033] → [14.370:427]

				surface = wlr_xdg_surface_surface_at(c->xdg_surface,

[10.1033]

[10.1100]

				surface = wlr_xdg_surface_surface_at(c->surface.xdg,

Replacement in dwl.c at line 455 [9.4]

B:BD[16.251] → [16.251:316]

	if (c->resize && c->resize <= c->xdg_surface->configure_serial)

[16.251]

[16.316]

	if (c->resize && c->resize <= c->surface.xdg->configure_serial)

Replacement in dwl.c at line 561 [9.4]
∅:D[17.170] → [18.581:612]
∅:D[19.818] → [18.581:612]
B:BD[18.581] → [18.581:612]
```
	c->xdg_surface = xdg_surface;
```
[19.818]
[4.66]
```
	c->surface.xdg = xdg_surface;
```

Replacement in dwl.c at line 566 [9.4]

B:BD[20.966] → [2.1:60]

	wlr_xdg_toplevel_set_tiled(c->xdg_surface, WLR_EDGE_TOP |

[20.966]

[2.60]

	wlr_xdg_toplevel_set_tiled(c->surface.xdg, WLR_EDGE_TOP |

Replacement in dwl.c at line 588 [9.4]
B:BD[10.1499] → [10.1499:1540]
```
	c->xwayland_surface = xwayland_surface;
```
[10.1499]
[3.55]
```
	c->surface.xwayland = xwayland_surface;
```

Replacement in dwl.c at line 694 [9.4]

B:BD[6.305] → [6.305:365]

			wlr_xwayland_surface_activate(old->xwayland_surface, 0);

[6.305]

[6.365]

			wlr_xwayland_surface_activate(old->surface.xwayland, 0);

Replacement in dwl.c at line 696 [9.4]

B:BD[6.372] → [6.372:428]

			wlr_xdg_toplevel_set_activated(old->xdg_surface, 0);

[6.372]

[21.490]

			wlr_xdg_toplevel_set_activated(old->surface.xdg, 0);

Replacement in dwl.c at line 722 [9.4]

B:BD[6.1004] → [6.1004:1061]

		wlr_xwayland_surface_activate(c->xwayland_surface, 1);

[6.1004]

[6.1061]

		wlr_xwayland_surface_activate(c->surface.xwayland, 1);

Replacement in dwl.c at line 724 [9.4]

B:BD[6.1067] → [6.1067:1120]

		wlr_xdg_toplevel_set_activated(c->xdg_surface, 1);

[6.1067]

[22.505]

		wlr_xdg_toplevel_set_activated(c->surface.xdg, 1);

Replacement in dwl.c at line 900 [9.4]
∅:D[8.357] → [23.146:199]
B:BD[23.146] → [23.146:199]
```
		wlr_xwayland_surface_close(sel->xwayland_surface);
```
[8.357]
[23.199]
```
		wlr_xwayland_surface_close(sel->surface.xwayland);
```

Replacement in dwl.c at line 902 [9.4]

B:BD[23.205] → [23.205:254]

		wlr_xdg_toplevel_send_close(sel->xdg_surface);

[23.205]

[9.11024]

		wlr_xdg_toplevel_send_close(sel->surface.xdg);

Replacement in dwl.c at line 933 [9.4]

∅:D[8.386] → [10.2451:2645]

∅:D[14.677] → [10.2451:2645]

B:BD[10.2451] → [10.2451:2645]

		c->geom.x = c->xwayland_surface->x;
		c->geom.y = c->xwayland_surface->y;
		c->geom.width = c->xwayland_surface->width + 2 * c->bw;
		c->geom.height = c->xwayland_surface->height + 2 * c->bw;

[8.386]

[14.678]

		c->geom.x = c->surface.xwayland->x;
		c->geom.y = c->surface.xwayland->y;
		c->geom.width = c->surface.xwayland->width + 2 * c->bw;
		c->geom.height = c->surface.xwayland->height + 2 * c->bw;

Replacement in dwl.c at line 938 [9.4]

B:BD[14.688] → [14.688:746]

		wlr_xdg_surface_get_geometry(c->xdg_surface, &c->geom);

[14.688]

[14.746]

		wlr_xdg_surface_get_geometry(c->surface.xdg, &c->geom);

Replacement in dwl.c at line 988 [9.4]

∅:D[8.414] → [14.824:890]

B:BD[14.824] → [14.824:890]

			surface = wlr_surface_surface_at(c->xwayland_surface->surface,

[8.414]

[10.2768]

			surface = wlr_surface_surface_at(c->surface.xwayland->surface,

Replacement in dwl.c at line 992 [9.4]

B:BD[10.2858] → [14.891:947]

			surface = wlr_xdg_surface_surface_at(c->xdg_surface,

[10.2858]

[10.2924]

			surface = wlr_xdg_surface_surface_at(c->surface.xdg,

Replacement in dwl.c at line 1186 [9.4]

∅:D[8.442] → [10.3286:3365]

∅:D[14.964] → [10.3286:3365]

B:BD[10.3286] → [10.3286:3365]

			wlr_surface_for_each_surface(c->xwayland_surface->surface, render, &rdata);

[8.442]

[14.965]

			wlr_surface_for_each_surface(c->surface.xwayland->surface, render, &rdata);

Replacement in dwl.c at line 1188 [9.4]

B:BD[14.972] → [14.972:1041]

			wlr_xdg_surface_for_each_surface(c->xdg_surface, render, &rdata);

[14.972]

[24.818]

			wlr_xdg_surface_for_each_surface(c->surface.xdg, render, &rdata);

Replacement in dwl.c at line 1200 [9.4]

∅:D[5.97] → [11.2302:2460]

B:BD[11.2302] → [11.2302:2460]

		geom.x = c->xwayland_surface->x;
		geom.y = c->xwayland_surface->y;
		geom.width = c->xwayland_surface->width;
		geom.height = c->xwayland_surface->height;

[5.97]

[11.2460]

		geom.x = c->surface.xwayland->x;
		geom.y = c->surface.xwayland->y;
		geom.width = c->surface.xwayland->width;
		geom.height = c->surface.xwayland->height;

Replacement in dwl.c at line 1211 [9.4]

B:BD[11.2649] → [11.2649:2721]

		rdata.x = c->xwayland_surface->x;
		rdata.y = c->xwayland_surface->y;

[11.2649]

[11.2721]

		rdata.x = c->surface.xwayland->x;
		rdata.y = c->surface.xwayland->y;

Replacement in dwl.c at line 1214 [9.4]

B:BD[11.2722] → [11.2722:2800]

		wlr_surface_for_each_surface(c->xwayland_surface->surface, render, &rdata);

[11.2722]

[11.2800]

		wlr_surface_for_each_surface(c->surface.xwayland->surface, render, &rdata);

Replacement in dwl.c at line 1283 [9.4]
∅:D[8.469] → [14.1057:1111]
B:BD[14.1057] → [14.1057:1111]
```
		wlr_xwayland_surface_configure(c->xwayland_surface,
```
[8.469]
[14.1111]
```
		wlr_xwayland_surface_configure(c->surface.xwayland,
```

Replacement in dwl.c at line 1287 [9.4]

B:BD[10.3491] → [16.854:910]

		c->resize = wlr_xdg_toplevel_set_size(c->xdg_surface,

[10.3491]

[10.3571]

		c->resize = wlr_xdg_toplevel_set_size(c->surface.xdg,

Replacement in dwl.c at line 1717 [9.4]

∅:D[8.496] → [11.3260:3635]

B:BD[11.3260] → [11.3260:3635]

		for (i = 0; i < c->xwayland_surface->window_type_len; i++)
			if (c->xwayland_surface->window_type[i] == netatom[NetWMWindowTypeDialog] ||
					c->xwayland_surface->window_type[i] == netatom[NetWMWindowTypeSplash] ||
					c->xwayland_surface->window_type[i] == netatom[NetWMWindowTypeToolbar] ||
					c->xwayland_surface->window_type[i] == netatom[NetWMWindowTypeUtility])

[8.496]

[11.3635]

		for (i = 0; i < c->surface.xwayland->window_type_len; i++)
			if (c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeDialog] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeSplash] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeToolbar] ||
					c->surface.xwayland->window_type[i] == netatom[NetWMWindowTypeUtility])