Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Don't set WAYLAND_DISPLAY

Browse source 
We don't actually support Wayland clients (yet). Xwayland doesn't use
WAYLAND_DISPLAY, the compositor creates a special Wayland socket instead.
This commit is contained in:
Simon Ser 2020-05-12 15:55:01 +02:00
parent 1e82803574
commit c0bdf361d5
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wlserver.c
View file

@ -406,6 +406,7 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlserver.wlr.compositor = wlr_compositor_create(wlserver.wl_display, wlserver.wlr.renderer);
wlserver.wlr.xwayland = wlr_xwayland_create(wlserver.wl_display, wlserver.wlr.compositor, False);
wl_signal_add(&wlserver.wlr.xwayland->events.ready, &xwayland_ready_listener);
const char *socket = wl_display_add_socket_auto(wlserver.wl_display);
if (!socket)
@ -420,7 +421,6 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlr_xwayland_set_seat(wlserver.wlr.xwayland, wlserver.wlr.seat);
wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", socket);
setenv("_WAYLAND_DISPLAY", socket, true);
if (!wlr_backend_start( wlserver.wlr.multi_backend ))
{
@ -430,10 +430,6 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
return 1;
}
setenv("WAYLAND_DISPLAY", socket, true);
wl_signal_add(&wlserver.wlr.xwayland->events.ready, &xwayland_ready_listener);
return 0;
}