feat: xwayland display export, environment variables set in dwl

2 files changed, 15 insertions, 0 deletions

diff --git a/config.def.h b/config.def.h
index 54f4c42..9f97854 100644
--- a/config.def.h
+++ b/config.def.h
@@ -28,6 +28,11 @@ static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 /* logging */
 static int log_level = WLR_ERROR;
 
+static const Env envs[] = {
+	/* variable			value */
+	{ "XDG_CURRENT_DESKTOP",	"wlroots" },
+};
+
 /* Autostart */
 static const char *const autostart[] = {
   "systemctl",  "--user" , "import-environment",  "WAYLAND_DISPLAY", "XDG_CURRENT_DESKTOP", "XDG_SESSION_DESKTOP", "XDG_SESSION_TYPE", NULL,
diff --git a/dwl.c b/dwl.c
index 30ccf1d..1d8a334 100644
--- a/dwl.c
+++ b/dwl.c
@@ -261,6 +261,11 @@ typedef struct {
 } Rule;
 
 typedef struct {
+	const char *variable;
+	const char *value;
+} Env;
+
+typedef struct {
 	struct wlr_scene_tree *scene;
 
 	struct wlr_session_lock_v1 *lock;
@@ -2580,6 +2585,8 @@ run(char *startup_cmd)
 	if (!socket)
 		die("startup: display_add_socket_auto");
 	setenv("WAYLAND_DISPLAY", socket, 1);
+	for (size_t i = 0; i < LENGTH(envs); i++)
+		setenv(envs[i].variable, envs[i].value, 1);
 
 	/* Start the backend. This will enumerate outputs and inputs, become the DRM
 	 * master, etc */
@@ -2599,6 +2606,9 @@ run(char *startup_cmd)
 		}
 	}
 
+  /* Added display setup for xwayland-satellite */
+  setenv("DISPLAY", ":0", 1);
+
 	drawbars();
 
 	/* At this point the outputs are initialized, choose initial selmon based on