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

wlserver: use gamescope-N wayland display name.

Browse source 
Letting wayland use the default makes random things connect to us, which we
don't want.

Fixes https://github.com/Plagman/gamescope/issues/96.

Related to the va-api problem, but most likely not the only fix:

https://github.com/Plagman/gamescope/issues/23
This commit is contained in:
Pierre-Loup A. Griffais 2020-09-01 11:52:55 -07:00
parent d36a11d39f
commit 2a98d2b85a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/wlserver.cpp
View file

@ -463,8 +463,18 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlserver.wlr.xwayland_server = wlr_xwayland_server_create(wlserver.wl_display, &xwayland_options); wlserver.wlr.xwayland_server = wlr_xwayland_server_create(wlserver.wl_display, &xwayland_options);
wl_signal_add(&wlserver.wlr.xwayland_server->events.ready, &xwayland_ready_listener); wl_signal_add(&wlserver.wlr.xwayland_server->events.ready, &xwayland_ready_listener);
const char *socket = wl_display_add_socket_auto(wlserver.wl_display); char wayland_display_name[32];
if (!socket) int result = -1;
int display_slot = 0;
while ( result != 0 && display_slot < 128 )
{
sprintf( wayland_display_name, "gamescope-%d", display_slot );
result = wl_display_add_socket( wlserver.wl_display, wayland_display_name );
display_slot++;
}
if ( result != 0 )
{ {
wlr_log_errno(WLR_ERROR, "Unable to open wayland socket"); wlr_log_errno(WLR_ERROR, "Unable to open wayland socket");
wlr_backend_destroy( wlserver.wlr.multi_backend ); wlr_backend_destroy( wlserver.wlr.multi_backend );
@ -474,7 +484,7 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlserver.wlr.seat = wlr_seat_create(wlserver.wl_display, "seat0"); wlserver.wlr.seat = wlr_seat_create(wlserver.wl_display, "seat0");
wlr_seat_set_capabilities( wlserver.wlr.seat, WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD ); wlr_seat_set_capabilities( wlserver.wlr.seat, WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD );
wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", socket); wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", wayland_display_name);
if (!wlr_backend_start( wlserver.wlr.multi_backend )) if (!wlr_backend_start( wlserver.wlr.multi_backend ))
{ {

2
subprojects/wlroots

@ -1 +1 @@
Subproject commit 2176c63856df4e411df0ba3c5eee43f69e977b6e Subproject commit 751a21d94f1b4f0345d040ddfd54b723631d5991