aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-03-02 15:14:23 +0100
committerDrew DeVault <sir@cmpwn.com>2019-03-04 12:54:06 -0700
commit9601019192a411aca889db48e6dc6c856d1e2a64 (patch)
tree0fbbefba42a0590496d429ae3b6313bcdab7c459 /rootston
parentfb106eb97925d16ed6744481a9798d068a6f6690 (diff)
xwayland: don't set DISPLAY
Let the compositor set it. This allows for multiple Xwayland instances to run at the same time. Fixes https://github.com/swaywm/wlroots/issues/1442
Diffstat (limited to 'rootston')
-rw-r--r--rootston/desktop.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 9a14395d..b0530ea1 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -382,6 +382,8 @@ struct roots_desktop *desktop_create(struct roots_server *server,
&desktop->xwayland_surface);
desktop->xwayland_surface.notify = handle_xwayland_surface;
+ setenv("DISPLAY", desktop->xwayland->display_name, true);
+
if (wlr_xcursor_manager_load(desktop->xcursor_manager, 1)) {
wlr_log(WLR_ERROR, "Cannot load XWayland XCursor theme");
}