Sivecano/dwl - Change 2SBFINJKOJLIY2COLC4PD2LRMOAAMVA7CJFU57GUL43XGS6QJF5QC

xwayland is the exceptional case, let xdg be 0

Created by Devin J. Pohly on July 21, 2020

2SBFINJKOJLIY2COLC4PD2LRMOAAMVA7CJFU57GUL43XGS6QJF5QC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 45 [5.4]

B:BD[3.153] → [4.28:128]

#define WLR_SURFACE(C)          (c->isxdg ? c->xdg_surface->surface : c->xwayland_surface->surface)

[3.153]

[5.814]

#define WLR_SURFACE(C)          (c->isx11 ? c->xwayland_surface->surface : c->xdg_surface->surface)

Replacement in dwl.c at line 77 [5.4]
B:BD[6.63] → [4.231:243]
```
	int isxdg;
```
[6.63]
[7.155]
```
	int isx11;
```

Replacement in dwl.c at line 284 [5.4]

B:BD[8.392] → [2.1:170]

	appid = c->isxdg ? c->xdg_surface->toplevel->app_id :
		c->xwayland_surface->class;
	title = c->isxdg ? c->xdg_surface->toplevel->title :
		c->xwayland_surface->title;

[8.392]

[2.170]

	appid = c->isx11 ? c->xwayland_surface->class :
		c->xdg_surface->toplevel->app_id;
	title = c->isx11 ? c->xwayland_surface->title :
		c->xdg_surface->toplevel->title;

Replacement in dwl.c at line 345 [5.4]

B:BD[9.49] → [4.864:938]

			if (c->isxdg)
				surface = wlr_xdg_surface_surface_at(c->xdg_surface,

[9.49]

[4.938]

			if (c->isx11)
				surface = wlr_surface_surface_at(c->xwayland_surface->surface,

Replacement in dwl.c at line 350 [5.4]

B:BD[4.1033] → [4.1033:1100]

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

[4.1033]

[4.1100]

				surface = wlr_xdg_surface_surface_at(c->xdg_surface,

Deletion in dwl.c at line 493 [5.4]
B:BD[10.612] → [4.1247:1262]
```
	c->isxdg = 1;
```
Replacement in dwl.c at line 517 [5.4]
B:BD[4.1540] → [4.1540:1555]
```
	c->isxdg = 0;
```
[4.1540]
[4.1555]
```
	c->isx11 = 1;
```

Replacement in dwl.c at line 654 [5.4]

B:BD[4.1994] → [4.1994:2075]

		if (ptl->isxdg)
			wlr_xdg_toplevel_set_activated(ptl->xdg_surface, 0);
		else

[4.1994]

[4.2075]

		if (ptl->isx11)

Insertion in dwl.c at line 656 [5.4]

[4.2135]

		else
			wlr_xdg_toplevel_set_activated(ptl->xdg_surface, 0);

Replacement in dwl.c at line 660 [5.4]

B:BD[4.2162] → [4.2162:2234]

		if (tl->isxdg)
			wlr_xdg_toplevel_set_activated(tl->xdg_surface, 1);

[4.2162]

[4.2234]

		if (tl->isx11)
			wlr_xwayland_surface_activate(tl->xwayland_surface, 1);

Replacement in dwl.c at line 663 [5.4]

B:BD[4.2241] → [4.2241:2300]

			wlr_xwayland_surface_activate(tl->xwayland_surface, 1);

[4.2241]

[4.2300]

			wlr_xdg_toplevel_set_activated(tl->xdg_surface, 1);

Replacement in dwl.c at line 835 [5.4]

B:BD[4.2305] → [4.2305:2451]

	if (c->isxdg) {
		wlr_xdg_surface_get_geometry(c->xdg_surface, &c->geom);
		c->geom.width += 2 * c->bw;
		c->geom.height += 2 * c->bw;
	} else {

[4.2305]

[4.2451]

	if (c->isx11) {

Insertion in dwl.c at line 840 [5.4]

[4.2645]

	} else {
		wlr_xdg_surface_get_geometry(c->xdg_surface, &c->geom);
		c->geom.width += 2 * c->bw;
		c->geom.height += 2 * c->bw;

Replacement in dwl.c at line 890 [5.4]

B:BD[4.2696] → [4.2696:2768]

		if (c->isxdg)
			surface = wlr_xdg_surface_surface_at(c->xdg_surface,

[4.2696]

[4.2768]

		if (c->isx11)
			surface = wlr_surface_surface_at(c->xwayland_surface->surface,

Replacement in dwl.c at line 895 [5.4]

B:BD[4.2858] → [4.2858:2924]

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

[4.2858]

[4.2924]

			surface = wlr_xdg_surface_surface_at(c->xdg_surface,

Replacement in dwl.c at line 1084 [5.4]

B:BD[4.3194] → [4.3194:3286]

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

[4.3194]

[4.3286]

		if (c->isx11)

Insertion in dwl.c at line 1086 [5.4]

[4.3365]

[11.818]

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

Replacement in dwl.c at line 1140 [5.4]

B:BD[12.389] → [4.3366:3425]

	if (c->isxdg)
		wlr_xdg_toplevel_set_size(c->xdg_surface,

[12.389]

[4.3425]

	if (c->isx11)
		wlr_xwayland_surface_configure(c->xwayland_surface,
				c->geom.x, c->geom.y,

Replacement in dwl.c at line 1145 [5.4]

B:BD[4.3491] → [4.3491:3571]

		wlr_xwayland_surface_configure(c->xwayland_surface,
				c->geom.x, c->geom.y,

[4.3491]

[4.3571]

		wlr_xdg_toplevel_set_size(c->xdg_surface,