From fcdc2f0e102497313232cc7c0a570cc4c524a02b Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:58:57 +0200
Subject: Attempt to improve fl_disable_wayland().

---
 src/drivers/Wayland/Fl_Wayland_System_Driver.H   |  1 +
 src/drivers/Wayland/Fl_Wayland_System_Driver.cxx | 18 ++++++++++++++++++
 src/drivers/Wayland/fl_wayland_platform_init.cxx | 12 ------------
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/drivers/Wayland')

diff --git a/src/drivers/Wayland/Fl_Wayland_System_Driver.H b/src/drivers/Wayland/Fl_Wayland_System_Driver.H
index e5203581e..75043cd04 100644
--- a/src/drivers/Wayland/Fl_Wayland_System_Driver.H
+++ b/src/drivers/Wayland/Fl_Wayland_System_Driver.H
@@ -26,6 +26,7 @@ public:
   int event_key(int k);
   int get_key(int k);
   virtual void *control_maximize_button(void *data);
+  virtual void disable_wayland();
 };
 
 #endif /* FL_WAYLAND_SYSTEM_DRIVER_H */
diff --git a/src/drivers/Wayland/Fl_Wayland_System_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_System_Driver.cxx
index 4b26a17ea..7c3cf9aa8 100644
--- a/src/drivers/Wayland/Fl_Wayland_System_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_System_Driver.cxx
@@ -88,3 +88,21 @@ void *Fl_Wayland_System_Driver::control_maximize_button(void *data) {
     return NULL;
   }
 }
+
+
+void Fl_Wayland_System_Driver::disable_wayland() {
+  if (fl_wl_display()) {
+    fprintf(stderr, "Error: fl_disable_wayland() cannot be called "
+            "after the Wayland display was opened\n");
+    exit(1);
+  }
+
+  if (Fl_Wayland_Screen_Driver::wl_display) {
+    wl_display_disconnect(Fl_Wayland_Screen_Driver::wl_display);
+    Fl_Wayland_Screen_Driver::wl_display = NULL;
+    delete Fl_Screen_Driver::system_driver;
+    Fl_Screen_Driver::system_driver = NULL;
+  }
+  Fl_Wayland_Screen_Driver::wld_disabled = true;
+  Fl::system_driver();
+}
diff --git a/src/drivers/Wayland/fl_wayland_platform_init.cxx b/src/drivers/Wayland/fl_wayland_platform_init.cxx
index 8e4f949f7..ffdc13a69 100644
--- a/src/drivers/Wayland/fl_wayland_platform_init.cxx
+++ b/src/drivers/Wayland/fl_wayland_platform_init.cxx
@@ -35,18 +35,6 @@
 #include <stdio.h>
 
 
-void fl_disable_wayland() {
-  if (Fl_Wayland_Screen_Driver::wl_display) {
-    wl_display_disconnect(Fl_Wayland_Screen_Driver::wl_display);
-    Fl_Wayland_Screen_Driver::wl_display = NULL;
-    delete Fl_Screen_Driver::system_driver;
-    Fl_Screen_Driver::system_driver = NULL;
-  }
-  Fl_Wayland_Screen_Driver::wld_disabled = true;
-  Fl::system_driver();
-}
-
-
 Fl_System_Driver *Fl_System_Driver::newSystemDriver() {
   const char *backend = ::getenv("FLTK_BACKEND");
   const char *xdgrt = ::getenv("XDG_RUNTIME_DIR");
-- 
cgit v1.2.3