Makefile

@@ -4,7 +4,7 @@
 include config.mk
 
 # flags for compiling
-DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
+DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XWAYLAND)
 DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused-parameter -Wshadow -Wunused-macros\
 	-Werror=strict-prototypes -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types -Wfloat-conversion
 

client.h

@@ -9,12 +9,19 @@
 static inline int
 client_is_x11(Client *c)
 {
+#ifdef XWAYLAND
+	return c->type == X11;
+#endif
 	return 0;
 }
 
 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;
 }
 
@@ -27,11 +34,22 @@ toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)
 	Client *c = NULL;
 	LayerSurface *l = NULL;
 	int type = -1;
+#ifdef XWAYLAND
+	struct wlr_xwayland_surface *xsurface;
+#endif
 
 	if (!s)
 		return -1;
 	root_surface = wlr_surface_get_root_surface(s);
 
+#ifdef XWAYLAND
+	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(root_surface))) {
+		c = xsurface->data;
+		type = c->type;
+		goto end;
+	}
+#endif
+
 	if ((layer_surface = wlr_layer_surface_v1_try_from_wlr_surface(root_surface))) {
 		l = layer_surface->data;
 		type = LayerShell;
@@ -75,6 +93,13 @@ static inline void
 client_activate_surface(struct wlr_surface *s, int activated)
 {
 	struct wlr_xdg_toplevel *toplevel;
+#ifdef XWAYLAND
+	struct wlr_xwayland_surface *xsurface;
+	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
+		wlr_xwayland_surface_activate(xsurface, activated);
+		return;
+	}
+#endif
 	if ((toplevel = wlr_xdg_toplevel_try_from_wlr_surface(s)))
 		wlr_xdg_toplevel_set_activated(toplevel, activated);
 }
@@ -82,6 +107,10 @@ client_activate_surface(struct wlr_surface *s, int activated)
 static inline uint32_t
 client_set_bounds(Client *c, int32_t width, int32_t height)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return 0;
+#endif
 	if (wl_resource_get_version(c->surface.xdg->toplevel->resource) >=
 			XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION && width >= 0 && height >= 0
 			&& (c->bounds.width != width || c->bounds.height != height)) {
@@ -95,6 +124,10 @@ client_set_bounds(Client *c, int32_t width, int32_t height)
 static inline const char *
 client_get_appid(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->class;
+#endif
 	return c->surface.xdg->toplevel->app_id;
 }
 
@@ -109,6 +142,11 @@ client_get_clip(Client *c, struct wlr_box *clip)
 		.height = c->geom.height - c->bw,
 	};
 
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return;
+#endif
+
 	wlr_xdg_surface_get_geometry(c->surface.xdg, &xdg_geom);
 	clip->x = xdg_geom.x;
 	clip->y = xdg_geom.y;
@@ -117,6 +155,15 @@ client_get_clip(Client *c, struct wlr_box *clip)
 static inline void
 client_get_geometry(Client *c, struct wlr_box *geom)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		geom->x = c->surface.xwayland->x;
+		geom->y = c->surface.xwayland->y;
+		geom->width = c->surface.xwayland->width;
+		geom->height = c->surface.xwayland->height;
+		return;
+	}
+#endif
 	wlr_xdg_surface_get_geometry(c->surface.xdg, geom);
 }
 
@@ -124,6 +171,10 @@ static inline Client *
 client_get_parent(Client *c)
 {
 	Client *p = NULL;
+#ifdef XWAYLAND
+	if (client_is_x11(c) && c->surface.xwayland->parent)
+		toplevel_from_wlr_surface(c->surface.xwayland->parent->surface, &p, NULL);
+#endif
 	if (c->surface.xdg->toplevel->parent)
 		toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL);
 	return p;
@@ -132,6 +183,10 @@ client_get_parent(Client *c)
 static inline const char *
 client_get_title(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->title;
+#endif
 	return c->surface.xdg->toplevel->title;
 }
 
@@ -141,6 +196,27 @@ client_is_float_type(Client *c)
 	struct wlr_xdg_toplevel *toplevel;
 	struct wlr_xdg_toplevel_state state;
 
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		struct wlr_xwayland_surface *surface = c->surface.xwayland;
+		xcb_size_hints_t *size_hints = surface->size_hints;
+		size_t i;
+		if (surface->modal)
+			return 1;
+
+		for (i = 0; i < surface->window_type_len; i++)
+			if (surface->window_type[i] == netatom[NetWMWindowTypeDialog]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeSplash]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeToolbar]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeUtility])
+				return 1;
+
+		return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0
+			&& (size_hints->max_width == size_hints->min_width
+				|| size_hints->max_height == size_hints->min_height);
+	}
+#endif
+
 	toplevel = c->surface.xdg->toplevel;
 	state = toplevel->current;
 	return toplevel->parent || (state.min_width != 0 && state.min_height != 0
@@ -169,6 +245,10 @@ client_is_stopped(Client *c)
 {
 	int pid;
 	siginfo_t in = {0};
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return 0;
+#endif
 
 	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
 	if (waitid(P_PID, pid, &in, WNOHANG|WCONTINUED|WSTOPPED|WNOWAIT) < 0) {
@@ -189,6 +269,10 @@ client_is_stopped(Client *c)
 static inline int
 client_is_unmanaged(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->override_redirect;
+#endif
 	return 0;
 }
 
@@ -205,12 +289,23 @@ client_notify_enter(struct wlr_surface *s, struct wlr_keyboard *kb)
 static inline void
 client_restack_surface(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		wlr_xwayland_surface_restack(c->surface.xwayland, NULL,
+				XCB_STACK_MODE_ABOVE);
+#endif
 	return;
 }
 
 static inline void
 client_send_close(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		wlr_xwayland_surface_close(c->surface.xwayland);
+		return;
+	}
+#endif
 	wlr_xdg_toplevel_send_close(c->surface.xdg->toplevel);
 }
 
@@ -225,12 +320,25 @@ client_set_border_color(Client *c, const float color[static 4])
 static inline void
 client_set_fullscreen(Client *c, int fullscreen)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen);
+		return;
+	}
+#endif
 	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg->toplevel, fullscreen);
 }
 
 static inline uint32_t
 client_set_size(Client *c, uint32_t width, uint32_t height)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		wlr_xwayland_surface_configure(c->surface.xwayland,
+				c->geom.x, c->geom.y, width, height);
+		return 0;
+	}
+#endif
 	if ((int32_t)width == c->surface.xdg->toplevel->current.width
 			&& (int32_t)height == c->surface.xdg->toplevel->current.height)
 		return 0;
@@ -240,6 +348,10 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
 static inline void
 client_set_tiled(Client *c, uint32_t edges)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return;
+#endif
 	if (wl_resource_get_version(c->surface.xdg->toplevel->resource)
 			>= XDG_TOPLEVEL_STATE_TILED_RIGHT_SINCE_VERSION) {
 		wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel, edges);
@@ -251,6 +363,12 @@ client_set_tiled(Client *c, uint32_t edges)
 static inline void
 client_set_suspended(Client *c, int suspended)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		wlr_xwayland_surface_set_withdrawn(c->surface.xwayland, suspended);
+		return;
+	}
+#endif
 
 	wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended);
 }
@@ -258,11 +376,20 @@ client_set_suspended(Client *c, int suspended)
 static inline int
 client_wants_focus(Client *c)
 {
+#ifdef XWAYLAND
+	return client_is_unmanaged(c)
+		&& wlr_xwayland_or_surface_wants_focus(c->surface.xwayland)
+		&& wlr_xwayland_icccm_input_model(c->surface.xwayland) != WLR_ICCCM_INPUT_MODEL_NONE;
+#endif
 	return 0;
 }
 
 static inline int
 client_wants_fullscreen(Client *c)
 {
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->fullscreen;
+#endif
 	return c->surface.xdg->toplevel->requested.fullscreen;
 }

config.def.h

@@ -20,8 +20,6 @@ static const char *const autostart[] = {
         "foot", NULL,
         "todoodoo", NULL,
         "firefox", NULL,
-        "somebar", NULL,
-        "someblocks", NULL,
         NULL /* terminate */
 };
 

dwl.c

@@ -54,6 +54,11 @@
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
+#ifdef XWAYLAND
+#include <wlr/xwayland.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_icccm.h>
+#endif
 
 #include "util.h"
 
@@ -73,6 +78,10 @@
 enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
 enum { XDGShell, LayerShell, X11 }; /* client types */
 enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrFS, LyrTop, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */
+#ifdef XWAYLAND
+enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
+	NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
+#endif
 
 typedef union {
 	int i;
@@ -115,6 +124,13 @@ typedef struct {
 	struct wl_listener destroy_decoration;
 	struct wlr_box prev; /* layout-relative, includes border */
 	struct wlr_box bounds;
+#ifdef XWAYLAND
+	struct wl_listener activate;
+	struct wl_listener associate;
+	struct wl_listener dissociate;
+	struct wl_listener configure;
+	struct wl_listener set_hints;
+#endif
 	unsigned int bw;
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
@@ -319,7 +335,6 @@ static void xytonode(double x, double y, struct wlr_surface **psurface,
 static void zoom(const Arg *arg);
 
 /* variables */
-static char const* autostart_runtime[256] = {NULL};
 static const char broken[] = "broken";
 static pid_t child_pid = -1;
 static int locked;
@@ -371,6 +386,19 @@ static struct wlr_box sgeom;
 static struct wl_list mons;
 static Monitor *selmon;
 
+#ifdef XWAYLAND
+static void activatex11(struct wl_listener *listener, void *data);
+static void associatex11(struct wl_listener *listener, void *data);
+static void configurex11(struct wl_listener *listener, void *data);
+static void createnotifyx11(struct wl_listener *listener, void *data);
+static void dissociatex11(struct wl_listener *listener, void *data);
+static xcb_atom_t getatom(xcb_connection_t *xc, const char *name);
+static void sethints(struct wl_listener *listener, void *data);
+static void xwaylandready(struct wl_listener *listener, void *data);
+static struct wlr_xwayland *xwayland;
+static xcb_atom_t netatom[NetLast];
+#endif
+
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
@@ -406,22 +434,10 @@ autostartexec(void) {
 	/* count entries */
 	for (p = autostart; *p; autostart_len++, p++)
 		while (*++p);
-	/* count runtime entries */
-	for (p = autostart_runtime; *p; autostart_len++, p++)
-		while (*++p);
 
 	autostart_pids = calloc(autostart_len, sizeof(pid_t));
 	for (p = autostart; *p; i++, p++) {
-    if ((autostart_pids[i] = fork()) == 0) {
+	        if ((autostart_pids[i] = fork()) == 0) {
-			setsid();
-			execvp(*p, (char *const *)p);
-			die("dwl: execvp %s:", *p);
-		}
-		/* skip arguments */
-		while (*++p);
-	}
-	for (p = autostart_runtime; *p; i++, p++) {
-		if ((autostart_pids[i] = fork()) == 0) {
 			setsid();
 			execvp(*p, (char *const *)p);
 			die("dwl: execvp %s:", *p);
@@ -642,6 +658,10 @@ void
 cleanup(void)
 {
   size_t i;
+#ifdef XWAYLAND
+	wlr_xwayland_destroy(xwayland);
+	xwayland = NULL;
+#endif
 	wl_display_destroy_clients(dpy);
 
 	/* kill child processes */
@@ -1126,9 +1146,20 @@ destroynotify(struct wl_listener *listener, void *data)
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
-	wl_list_remove(&c->commit.link);
+#ifdef XWAYLAND
-	wl_list_remove(&c->map.link);
+	if (c->type != XDGShell) {
-	wl_list_remove(&c->unmap.link);
+		wl_list_remove(&c->activate.link);
+		wl_list_remove(&c->associate.link);
+		wl_list_remove(&c->configure.link);
+		wl_list_remove(&c->dissociate.link);
+		wl_list_remove(&c->set_hints.link);
+	} else
+#endif
+	{
+		wl_list_remove(&c->commit.link);
+		wl_list_remove(&c->map.link);
+		wl_list_remove(&c->unmap.link);
+	}
 	free(c);
 }
 
@@ -1305,7 +1336,11 @@ handlesig(int signo)
 		 * use WNOWAIT to keep the child waitable until we know it's not
 		 * XWayland.
 		 */
-		while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid) {
+		while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
+			        #ifdef XWAYLAND
+			   && (!xwayland || in.si_pid != xwayland->server->pid)
+#endif
+		       ) {
 			pid_t *p, *lim;
 			waitpid(in.si_pid, NULL, 0);
 			if (in.si_pid == child_pid)
@@ -2404,6 +2439,20 @@ setup(void)
 	 * e.g when running in the x11 backend or the wayland backend and the
 	 * compositor has Xwayland support */
 	unsetenv("DISPLAY");
+#ifdef XWAYLAND
+	/*
+	 * Initialise the XWayland X server.
+	 * It will be started when the first X client is started.
+	 */
+	if ((xwayland = wlr_xwayland_create(dpy, compositor, 1))) {
+		LISTEN_STATIC(&xwayland->events.ready, xwaylandready);
+		LISTEN_STATIC(&xwayland->events.new_surface, createnotifyx11);
+
+		setenv("DISPLAY", xwayland->display_name, 1);
+	} else {
+		fprintf(stderr, "failed to setup XWayland X server, continuing without it\n");
+	}
+#endif
 }
 
 void
@@ -2798,27 +2847,140 @@ zoom(const Arg *arg)
 	arrange(selmon);
 }
 
+#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 (!client_is_unmanaged(c))
+		wlr_xwayland_surface_activate(c->surface.xwayland, 1);
+}
+
+void
+associatex11(struct wl_listener *listener, void *data)
+{
+	Client *c = wl_container_of(listener, c, associate);
+
+	LISTEN(&client_surface(c)->events.map, &c->map, mapnotify);
+	LISTEN(&client_surface(c)->events.unmap, &c->unmap, unmapnotify);
+}
+
+void
+configurex11(struct wl_listener *listener, void *data)
+{
+	Client *c = wl_container_of(listener, c, configure);
+	struct wlr_xwayland_surface_configure_event *event = data;
+	if (!c->mon)
+		return;
+	if (c->isfloating || client_is_unmanaged(c))
+		resize(c, (struct wlr_box){.x = event->x, .y = event->y,
+				.width = event->width, .height = event->height}, 0);
+	else
+		arrange(c->mon);
+}
+
+void
+createnotifyx11(struct wl_listener *listener, void *data)
+{
+	struct wlr_xwayland_surface *xsurface = data;
+	Client *c;
+
+	/* Allocate a Client for this surface */
+	c = xsurface->data = ecalloc(1, sizeof(*c));
+	c->surface.xwayland = xsurface;
+	c->type = X11;
+	c->bw = borderpx;
+
+	/* Listen to the various events it can emit */
+	LISTEN(&xsurface->events.associate, &c->associate, associatex11);
+	LISTEN(&xsurface->events.destroy, &c->destroy, destroynotify);
+	LISTEN(&xsurface->events.dissociate, &c->dissociate, dissociatex11);
+	LISTEN(&xsurface->events.request_activate, &c->activate, activatex11);
+	LISTEN(&xsurface->events.request_configure, &c->configure, configurex11);
+	LISTEN(&xsurface->events.request_fullscreen, &c->fullscreen, fullscreennotify);
+	LISTEN(&xsurface->events.set_hints, &c->set_hints, sethints);
+	LISTEN(&xsurface->events.set_title, &c->set_title, updatetitle);
+}
+
+void
+dissociatex11(struct wl_listener *listener, void *data)
+{
+	Client *c = wl_container_of(listener, c, dissociate);
+	wl_list_remove(&c->map.link);
+	wl_list_remove(&c->unmap.link);
+}
+
+xcb_atom_t
+getatom(xcb_connection_t *xc, const char *name)
+{
+	xcb_atom_t atom = 0;
+	xcb_intern_atom_reply_t *reply;
+	xcb_intern_atom_cookie_t 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
+sethints(struct wl_listener *listener, void *data)
+{
+	Client *c = wl_container_of(listener, c, set_hints);
+	struct wlr_surface *surface = client_surface(c);
+	if (c == focustop(selmon))
+		return;
+
+	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
+	printstatus();
+
+	if (c->isurgent && surface && surface->mapped)
+		client_set_border_color(c, urgentcolor);
+}
+
+void
+xwaylandready(struct wl_listener *listener, void *data)
+{
+	struct wlr_xcursor *xcursor;
+	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[NetWMWindowTypeToolbar] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");
+	netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_UTILITY");
+
+	/* assign the one and only seat */
+	wlr_xwayland_set_seat(xwayland, seat);
+
+	/* Set the default XWayland cursor to match the rest of dwl. */
+	if ((xcursor = wlr_xcursor_manager_get_xcursor(cursor_mgr, "default", 1)))
+		wlr_xwayland_set_cursor(xwayland,
+				xcursor->images[0]->buffer, xcursor->images[0]->width * 4,
+				xcursor->images[0]->width, xcursor->images[0]->height,
+				xcursor->images[0]->hotspot_x, xcursor->images[0]->hotspot_y);
+
+	xcb_disconnect(xc);
+}
+#endif
+
 int
 main(int argc, char *argv[])
 {
 	char *startup_cmd = NULL;
 	int c;
-	char *path = calloc(8192, sizeof(char));
 
-	int autostart_runtime_idx = 0;
+	while ((c = getopt(argc, argv, "s:hdv")) != -1) {
-
-	strcat(path, getenv("PATH"));
-	while ((c = getopt(argc, argv, "e:p:s:hdv")) != -1) {
 		if (c == 's')
 			startup_cmd = optarg;
-		else if (c == 'p') {
-			strcat(path, ":");
-			strcat(path, optarg);
-		}
-		else if (c == 'e') {
-			autostart_runtime[autostart_runtime_idx] = optarg;
-			autostart_runtime_idx++;
-		}
 		else if (c == 'd')
 			log_level = WLR_DEBUG;
 		else if (c == 'v')
@@ -2832,14 +2994,11 @@ main(int argc, char *argv[])
 	/* Wayland requires XDG_RUNTIME_DIR for creating its communications socket */
 	if (!getenv("XDG_RUNTIME_DIR"))
 		die("XDG_RUNTIME_DIR must be set");
-	if (setenv("PATH", path, 1))
-		die("Failed to set PATH");
-	free(path);
 	setup();
 	run(startup_cmd);
 	cleanup();
 	return EXIT_SUCCESS;
 
 usage:
-	die("Usage: %s [-v] [-d] [-s startup command] [[-p path directory] ...] [[-e autostart file] ...]", argv[0]);
+	die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
 }