Sivecano/dwl - Change 4QUF4MKRSB5LYYS5FSYTCDSIEMYIERI2BQZLRGJ3GIGVYCPJVEPAC

make XWayland support optional

Created by Devin J. Pohly on August 10, 2020

4QUF4MKRSB5LYYS5FSYTCDSIEMYIERI2BQZLRGJ3GIGVYCPJVEPAC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 36 [8.4]

[8.781]

[9.1]

#include <xkbcommon/xkbcommon.h>
#ifdef XWAYLAND
#include <X11/Xlib.h>

Replacement in dwl.c at line 40 [8.4]
B:BD[9.27] → [10.1:23]
∅:D[10.23] → [8.781:814]
∅:D[9.27] → [8.781:814]
B:BD[8.781] → [8.781:814]
```
#include <X11/Xlib.h>
#include <xkbcommon/xkbcommon.h>
```
[9.27]
[11.1]
```
#endif
```
Insertion in dwl.c at line 50 [8.4]
[12.153]
[13.1]
```
#ifdef XWAYLAND
```

Insertion in dwl.c at line 52 [8.4]

[13.118]

[8.814]

#else
#define WLR_SURFACE(C)          ((C)->surface.xdg->surface)
#endif

Insertion in dwl.c at line 60 [8.4]
[10.154]
[14.1]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 62 [8.4]
[14.65]
[8.1705]
```
#endif
```
Insertion in dwl.c at line 85 [8.4]
[13.150]
[13.150]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 87 [8.4]
[13.191]
[13.191]
```
#endif
```
Insertion in dwl.c at line 89 [8.4]
[13.203]
[10.155]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 91 [8.4]
[10.185]
[15.1]
```
#endif
```
Insertion in dwl.c at line 98 [8.4]
[16.170]
[17.70]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 100 [8.4]
[17.90]
[18.51]
```
#endif
```

Deletion in dwl.c at line 174 [8.4]

B:BD[19.29] → [20.1:68]

static void activatex11(struct wl_listener *listener, void *data);

Deletion in dwl.c at line 185 [8.4]

B:BD[2.69] → [2.69:140]

static void createnotifyx11(struct wl_listener *listener, void *data);

Deletion in dwl.c at line 195 [8.4]
∅:D[5.38] → [10.251:312]
B:BD[21.41] → [10.251:312]
```
static Atom getatom(xcb_connection_t *xc, const char *name);
```
Deletion in dwl.c at line 233 [8.4]
B:BD[22.80] → [10.391:432]
```
static void updatewindowtype(Client *c);
```

Deletion in dwl.c at line 234 [8.4]

B:BD[10.511] → [10.511:580]

static void xwaylandready(struct wl_listener *listener, void *data);

Deletion in dwl.c at line 245 [8.4]
B:BD[9.434] → [9.434:472]
```
static struct wlr_xwayland *xwayland;
```
Deletion in dwl.c at line 266 [8.4]
B:BD[16.679] → [23.1:2]
B:BD[23.2] → [10.618:648]
```
static Atom netatom[NetLast];
```

Deletion in dwl.c at line 277 [8.4]

B:BD[2.211] → [2.211:289]

static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};

Insertion in dwl.c at line 280 [8.4]

[24.128]

[10.650]


#ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data);
static void createnotifyx11(struct wl_listener *listener, void *data);
static Atom getatom(xcb_connection_t *xc, const char *name);
static void renderindependents(struct wlr_output *output, struct timespec *now);
static void updatewindowtype(Client *c);
static void xwaylandready(struct wl_listener *listener, void *data);
static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};

Insertion in dwl.c at line 290 [8.4]

[10.720]

[8.2394]

static struct wlr_xwayland *xwayland;
static Atom netatom[NetLast];
#endif

Deletion in dwl.c at line 301 [8.4]
∅:D[25.223] → [19.2740:2745]
B:BD[19.2740] → [19.2740:2745]
B:BD[19.2745] → [20.69:123]
∅:D[20.123] → [10.772:834]
B:BD[10.772] → [10.772:834]
B:BD[10.834] → [26.1:54]
∅:D[26.54] → [27.1:35]
B:BD[10.834] → [27.1:35]
B:BD[27.35] → [13.204:274]
∅:D[13.274] → [10.930:933]
B:BD[10.930] → [10.930:933]
```
void
activatex11(struct wl_listener *listener, void *data)
{
       Client *c = wl_container_of(listener, c, activate);
       /* Only "managed" windows can be activated */
       if (c->type == X11Managed)
               wlr_xwayland_surface_activate(c->surface.xwayland, 1);
}
```

Replacement in dwl.c at line 328 [8.4]

B:BD[25.392] → [13.275:466]

	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;

[25.392]

[28.170]

#ifdef XWAYLAND
	updatewindowtype(c);
	if (c->type != XDGShell) {
		appid = c->surface.xwayland->class;
		title = c->surface.xwayland->title;
	} else
#endif
	{
		appid = c->surface.xdg->toplevel->app_id;
		title = c->surface.xdg->toplevel->title;
	}

Deletion in dwl.c at line 355 [8.4]
B:BD[25.809] → [10.939:961]
```
	updatewindowtype(c);
```
Deletion in dwl.c at line 568 [8.4]
∅:D[13.690] → [14.66:87]
B:BD[29.612] → [14.66:87]
```
	c->type = XDGShell;
```

Deletion in dwl.c at line 583 [8.4]

B:BD[29.923] → [9.1263:1271]

B:BD[9.1271] → [2.346:404]

∅:D[2.404] → [9.1334:1499]

B:BD[9.1334] → [9.1334:1499]

B:BD[9.1499] → [13.751:792]

∅:D[13.792] → [26.55:131]

B:BD[30.443] → [26.55:131]

∅:D[26.131] → [9.1555:1623]

∅:D[30.443] → [9.1555:1623]

B:BD[9.1555] → [9.1555:1623]

B:BD[9.1623] → [26.132:161]

∅:D[26.161] → [9.1652:1708]

∅:D[31.245] → [9.1652:1708]

∅:D[10.1209] → [9.1652:1708]

B:BD[9.1652] → [9.1652:1708]

B:BD[9.1708] → [26.162:194]

∅:D[26.194] → [9.1740:1800]

∅:D[10.1305] → [9.1740:1800]

B:BD[9.1740] → [9.1740:1800]

B:BD[9.1800] → [27.36:181]

∅:D[27.181] → [9.1836:1900]

B:BD[9.1836] → [9.1836:1900]

}
void
createnotifyx11(struct wl_listener *listener, void *data)
{
	struct wlr_xwayland_surface *xwayland_surface = data;
	Client *c;
	/* Allocate a Client for this surface */
	c = xwayland_surface->data = calloc(1, sizeof(*c));
	c->surface.xwayland = xwayland_surface;
	c->type = xwayland_surface->override_redirect ? X11Unmanaged : X11Managed;
	c->bw = borderpx;
	/* Listen to the various events it can emit */
	c->map.notify = maprequest;
	wl_signal_add(&xwayland_surface->events.map, &c->map);
	c->unmap.notify = unmapnotify;
	wl_signal_add(&xwayland_surface->events.unmap, &c->unmap);
	c->activate.notify = activatex11;
	wl_signal_add(&xwayland_surface->events.request_activate, &c->activate);
	c->destroy.notify = destroynotify;
	wl_signal_add(&xwayland_surface->events.destroy, &c->destroy);

Replacement in dwl.c at line 629 [8.4]
B:BD[32.100] → [15.435:496]
```
	if (c->type == XDGShell)
		wl_list_remove(&c->commit.link);
```
[32.100]
[33.1]
```
#ifdef XWAYLAND
```

Insertion in dwl.c at line 632 [8.4]

[33.66]

[34.2017]

	else if (c->type == XDGShell)
#endif
		wl_list_remove(&c->commit.link);

Insertion in dwl.c at line 682 [8.4]
[35.276]
[35.276]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 686 [8.4]
[35.372]
[13.854]
```
#endif
```
Insertion in dwl.c at line 707 [8.4]
[35.978]
[35.978]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 711 [8.4]
[35.1067]
[13.969]
```
#endif
```

Deletion in dwl.c at line 759 [8.4]

B:BD[36.1097] → [10.1460:1516]

B:BD[10.1516] → [37.1:17]

B:BD[10.1557] → [10.1557:1624]


Atom
getatom(xcb_connection_t *xc, const char *name)
{
	Atom atom = 0;
	xcb_intern_atom_cookie_t cookie;
	xcb_intern_atom_reply_t *reply;

Deletion in dwl.c at line 760 [8.4]

B:BD[36.1098] → [10.1625:1679]

B:BD[10.1679] → [7.1:57]

∅:D[7.57] → [10.1768:1822]

B:BD[10.1768] → [10.1768:1822]

	cookie = xcb_intern_atom(xc, 0, strlen(name), name);
	if ((reply = xcb_intern_atom_reply(xc, cookie, NULL)))
		atom = reply->atom;
	free(reply);
	return atom;
}

Insertion in dwl.c at line 878 [8.4]
[38.129]
[39.329]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 882 [8.4]
[38.205]
[13.1077]
```
#endif
```
Insertion in dwl.c at line 892 [8.4]
[26.196]
[26.196]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 898 [8.4]
[26.341]
[26.341]
```
#endif
```
Insertion in dwl.c at line 905 [8.4]
[9.2305]
[39.358]
```
#ifdef XWAYLAND
```
Replacement in dwl.c at line 911 [8.4]
∅:D[13.1321] → [30.678:688]
B:BD[9.2645] → [30.678:688]
```
	} else {
```
[13.1321]
[13.1322]
```
	} else
#endif
	{
```
Insertion in dwl.c at line 975 [8.4]
[9.2696]
[39.387]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 981 [8.4]
[9.2858]
[13.1448]
```
#endif
```
Insertion in dwl.c at line 1175 [8.4]
[9.3194]
[39.415]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1179 [8.4]
[30.972]
[13.1585]
```
#endif
```

Deletion in dwl.c at line 1185 [8.4]

B:BD[40.829] → [10.2117:2249]

B:BD[10.2249] → [41.45:97]

B:BD[41.97] → [13.1655:1813]

∅:D[13.1813] → [10.2460:2604]

B:BD[10.2460] → [10.2460:2604]

B:BD[10.2604] → [6.85:130]

∅:D[6.130] → [13.1814:1886]

B:BD[10.2649] → [13.1814:1886]

∅:D[13.1886] → [10.2721:2722]

B:BD[10.2721] → [10.2721:2722]

B:BD[10.2722] → [13.1887:1965]

∅:D[13.1965] → [10.2800:2811]

B:BD[10.2800] → [10.2800:2811]

renderindependents(struct wlr_output *output, struct timespec *now)
{
	Client *c;
	struct render_data rdata;
	struct wlr_box geom;
	wl_list_for_each_reverse(c, &independents, link) {
		geom.x = c->surface.xwayland->x;
		geom.y = c->surface.xwayland->y;
		geom.width = c->surface.xwayland->width;
		geom.height = c->surface.xwayland->height;
		/* Only render visible clients which show on this output */
		if (!wlr_output_layout_intersects(output_layout, output, &geom))
			continue;
		rdata.output = output;
		rdata.when = now;
		rdata.x = c->surface.xwayland->x;
		rdata.y = c->surface.xwayland->y;
		wlr_surface_for_each_surface(c->surface.xwayland->surface, render, &rdata);
	}
}
void

Insertion in dwl.c at line 1215 [8.4]
[15.814]
[4.1]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1217 [8.4]
[4.44]
[12.580]
```
#endif
```
Insertion in dwl.c at line 1250 [8.4]
[42.389]
[39.443]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1256 [8.4]
[9.3491]
[13.2021]
```
#endif
```
Insertion in dwl.c at line 1551 [8.4]
[9.3836]
[9.3836]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1565 [8.4]
[9.4232]
[43.1472]
```
#endif
```
Insertion in dwl.c at line 1677 [8.4]
[44.121]
[26.343]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1680 [8.4]
[26.383]
[26.383]
```
#endif
```

Deletion in dwl.c at line 1684 [8.4]

∅:D[45.1535] → [12.800:808]

B:BD[46.1238] → [12.800:808]

B:BD[10.3203] → [10.3203:3245]

B:BD[10.3245] → [39.470:496]

B:BD[39.496] → [13.2078:2453]

∅:D[13.2453] → [10.3635:3974]

B:BD[10.3635] → [10.3635:3974]

B:BD[10.3974] → [7.58:165]

∅:D[7.165] → [10.4016:4427]

B:BD[10.4016] → [10.4016:4427]

}
void
updatewindowtype(Client *c)
{
	size_t i;
	if (c->type != XDGShell)
		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])
				c->isfloating = 1;
}
void
xwaylandready(struct wl_listener *listener, void *data) {
	xcb_connection_t *xc = xcb_connect(xwayland->display_name, NULL);
	int err = xcb_connection_has_error(xc);
	if (err) {
		fprintf(stderr, "xcb_connect to X server failed with code %d\n. Continuing with degraded functionality.\n", err);
		return;
	}
	/* Collect atoms we are interested in.  If getatom returns 0, we will
	 * not detect that window type. */
	netatom[NetWMWindowTypeDialog] = getatom(xc, "_NET_WM_WINDOW_TYPE_DIALOG");
	netatom[NetWMWindowTypeSplash] = getatom(xc, "_NET_WM_WINDOW_TYPE_SPLASH");
	netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");
	netatom[NetWMWindowTypeToolbar] = getatom(xc, "_NET_WM_WINDOW_TYPE_UTILITY");
	/* assign the one and only seat */
	wlr_xwayland_set_seat(xwayland, seat);
	xcb_disconnect(xc);

Insertion in dwl.c at line 1748 [8.4]

[47.540]

[48.1276]

}
#ifdef XWAYLAND
void
activatex11(struct wl_listener *listener, void *data)
{
       Client *c = wl_container_of(listener, c, activate);
       /* Only "managed" windows can be activated */
       if (c->type == X11Managed)
               wlr_xwayland_surface_activate(c->surface.xwayland, 1);
}
void
createnotifyx11(struct wl_listener *listener, void *data)
{
	struct wlr_xwayland_surface *xwayland_surface = data;
	Client *c;
	/* Allocate a Client for this surface */
	c = xwayland_surface->data = calloc(1, sizeof(*c));
	c->surface.xwayland = xwayland_surface;
	c->type = xwayland_surface->override_redirect ? X11Unmanaged : X11Managed;
	c->bw = borderpx;
	/* Listen to the various events it can emit */
	c->map.notify = maprequest;
	wl_signal_add(&xwayland_surface->events.map, &c->map);
	c->unmap.notify = unmapnotify;
	wl_signal_add(&xwayland_surface->events.unmap, &c->unmap);
	c->activate.notify = activatex11;
	wl_signal_add(&xwayland_surface->events.request_activate, &c->activate);
	c->destroy.notify = destroynotify;
	wl_signal_add(&xwayland_surface->events.destroy, &c->destroy);
}
Atom
getatom(xcb_connection_t *xc, const char *name)
{
	Atom atom = 0;
	xcb_intern_atom_cookie_t cookie;
	xcb_intern_atom_reply_t *reply;
	cookie = xcb_intern_atom(xc, 0, strlen(name), name);
	if ((reply = xcb_intern_atom_reply(xc, cookie, NULL)))
		atom = reply->atom;
	free(reply);
	return atom;
}
void
renderindependents(struct wlr_output *output, struct timespec *now)
{
	Client *c;
	struct render_data rdata;
	struct wlr_box geom;
	wl_list_for_each_reverse(c, &independents, link) {
		geom.x = c->surface.xwayland->x;
		geom.y = c->surface.xwayland->y;
		geom.width = c->surface.xwayland->width;
		geom.height = c->surface.xwayland->height;
		/* Only render visible clients which show on this output */
		if (!wlr_output_layout_intersects(output_layout, output, &geom))
			continue;
		rdata.output = output;
		rdata.when = now;
		rdata.x = c->surface.xwayland->x;
		rdata.y = c->surface.xwayland->y;
		wlr_surface_for_each_surface(c->surface.xwayland->surface, render, &rdata);
	}
}
void
updatewindowtype(Client *c)
{
	size_t i;
	if (c->type != XDGShell)
		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])
				c->isfloating = 1;

Insertion in dwl.c at line 1839 [8.4]

[48.1279]

[43.3164]

void
xwaylandready(struct wl_listener *listener, void *data)
{
	xcb_connection_t *xc = xcb_connect(xwayland->display_name, NULL);
	int err = xcb_connection_has_error(xc);
	if (err) {
		fprintf(stderr, "xcb_connect to X server failed with code %d\n. Continuing with degraded functionality.\n", err);
		return;
	}
	/* Collect atoms we are interested in.  If getatom returns 0, we will
	 * not detect that window type. */
	netatom[NetWMWindowTypeDialog] = getatom(xc, "_NET_WM_WINDOW_TYPE_DIALOG");
	netatom[NetWMWindowTypeSplash] = getatom(xc, "_NET_WM_WINDOW_TYPE_SPLASH");
	netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");
	netatom[NetWMWindowTypeToolbar] = getatom(xc, "_NET_WM_WINDOW_TYPE_UTILITY");
	/* assign the one and only seat */
	wlr_xwayland_set_seat(xwayland, seat);
	xcb_disconnect(xc);
}
#endif

Insertion in dwl.c at line 1907 [8.4]
[8.36236]
[9.4233]
```
#ifdef XWAYLAND
```
Insertion in dwl.c at line 1909 [8.4]
[9.4266]
[49.2621]
```
#endif
```

File addition: config.mk (----------)

[8.2]

# Default compile flags (overridable by environment)
CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function
# Uncomment to build XWayland support
#CFLAGS += -DXWAYLAND

Insertion in Makefile at line 1 [8.38336]

[8.38336]

[8.38337]

include config.mk
CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99 -Werror=declaration-after-statement

Deletion in Makefile at line 8 [8.38336]
B:BD[50.5] → [3.4:106]
∅:D[3.106] → [51.2383:2461]
B:BD[51.2383] → [51.2383:2461]
∅:D[51.2461] → [50.59:60]
B:BD[50.59] → [50.59:60]
```
CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function
CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99 -Werror=declaration-after-statement
```

make XWayland support optional

Dependencies

In channels

Change contents

Insertion in dwl.c at line 36 [8.4]

Replacement in dwl.c at line 40 [8.4]

Insertion in dwl.c at line 50 [8.4]

Insertion in dwl.c at line 52 [8.4]

Insertion in dwl.c at line 60 [8.4]

Insertion in dwl.c at line 62 [8.4]

Insertion in dwl.c at line 85 [8.4]

Insertion in dwl.c at line 87 [8.4]

Insertion in dwl.c at line 89 [8.4]

Insertion in dwl.c at line 91 [8.4]

Insertion in dwl.c at line 98 [8.4]

Insertion in dwl.c at line 100 [8.4]

Deletion in dwl.c at line 174 [8.4]

Deletion in dwl.c at line 185 [8.4]

Deletion in dwl.c at line 195 [8.4]

Deletion in dwl.c at line 233 [8.4]

Deletion in dwl.c at line 234 [8.4]

Deletion in dwl.c at line 245 [8.4]

Deletion in dwl.c at line 266 [8.4]

Deletion in dwl.c at line 277 [8.4]

Insertion in dwl.c at line 280 [8.4]

Insertion in dwl.c at line 290 [8.4]

Deletion in dwl.c at line 301 [8.4]

Replacement in dwl.c at line 328 [8.4]

Deletion in dwl.c at line 355 [8.4]

Deletion in dwl.c at line 568 [8.4]

Deletion in dwl.c at line 583 [8.4]

Replacement in dwl.c at line 629 [8.4]

Insertion in dwl.c at line 632 [8.4]

Insertion in dwl.c at line 682 [8.4]

Insertion in dwl.c at line 686 [8.4]

Insertion in dwl.c at line 707 [8.4]

Insertion in dwl.c at line 711 [8.4]

Deletion in dwl.c at line 759 [8.4]

Deletion in dwl.c at line 760 [8.4]

Insertion in dwl.c at line 878 [8.4]

Insertion in dwl.c at line 882 [8.4]

Insertion in dwl.c at line 892 [8.4]

Insertion in dwl.c at line 898 [8.4]

Insertion in dwl.c at line 905 [8.4]

Replacement in dwl.c at line 911 [8.4]

Insertion in dwl.c at line 975 [8.4]

Insertion in dwl.c at line 981 [8.4]

Insertion in dwl.c at line 1175 [8.4]

Insertion in dwl.c at line 1179 [8.4]

Deletion in dwl.c at line 1185 [8.4]

Insertion in dwl.c at line 1215 [8.4]

Insertion in dwl.c at line 1217 [8.4]

Insertion in dwl.c at line 1250 [8.4]

Insertion in dwl.c at line 1256 [8.4]

Insertion in dwl.c at line 1551 [8.4]

Insertion in dwl.c at line 1565 [8.4]

Insertion in dwl.c at line 1677 [8.4]

Insertion in dwl.c at line 1680 [8.4]

Deletion in dwl.c at line 1684 [8.4]

Insertion in dwl.c at line 1748 [8.4]

Insertion in dwl.c at line 1839 [8.4]

Insertion in dwl.c at line 1907 [8.4]

Insertion in dwl.c at line 1909 [8.4]

File addition: config.mk (----------)

Insertion in Makefile at line 1 [8.38336]

Deletion in Makefile at line 8 [8.38336]