mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: improve processing of the -display command line argument

Browse Source
This commit is contained in:
ManoloFLTK 2022-11-08 08:16:55 +01:00
parent 402b08cb6e
commit 1a41178e77
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View File

@ -1473,7 +1473,18 @@ void Fl_Wayland_Screen_Driver::reset_spot() {
void Fl_Wayland_Screen_Driver::display(const char *d)
{
if (d) ::setenv("WAYLAND_DISPLAY", d, 1);
if (d && !seat) { // if display was opened, it's too late
if (wl_display) {
// only the wl_display_connect() call was done, redo it because the target
// Wayland compositor may be different
wl_display_disconnect(wl_display);
}
wl_display = wl_display_connect(d);
if (!wl_display) {
fprintf(stderr, "Error: '%s' is not an active Wayland socket\n", d);
exit(1);
}
}
}