Wayland: improve processing of the -display command line argument

1 files changed, 12 insertions, 1 deletions

diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
index cd067883a..bc3c67c72 100644
--- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
@@ -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);
+    }
+  }
 }