Improved XWayland detection.

ggarra13 · Apr 30, 2024 · ced9dd5 · ced9dd5
1 parent 075f5ad
commit ced9dd5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -35,8 +35,6 @@ v1.1.4
 - Fixed Playlist creation showing an empty view for the first clip loaded.
   (regression of v1.1.2).
 - Several fixes to Presentation Mode.
-- From now on, Windows' beta releases on sourceforge have debugging
-  information.
 
 
 v1.1.3

diff --git a/mrv2/docs/en/.buildinfo b/mrv2/docs/en/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 6cab1de14fe7829d9bc6e9341ca66fbb
+config: a627f2737ff7f1d235939e648446f697
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/mrv2/docs/es/.buildinfo b/mrv2/docs/es/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 053eed921a906e838769673c6e47ec7e
+config: 47fbacf810b744ffa4e0b13215a696fc
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/mrv2/lib/mrvUI/mrvUtil.cpp b/mrv2/lib/mrvUI/mrvUtil.cpp
@@ -45,17 +45,21 @@ namespace mrv
         return svg;
     }
 
-    bool          runningUnderXWayland()
+    bool runningUnderXWayland()
     {
         bool out = false;
 #ifdef __linux__
 #    ifdef FLTK_USE_X11
         if (fl_x11_display())
         {
-            const char* backend = fl_getenv("FLTK_BACKEND");
-            if (backend && strcmp(backend, "x11") == 0)
+            const char* session = fl_getenv("XDG_SESSION_TYPE");
+            if (session && strcmp(session, "wayland") == 0)
             {
-                out = true;
+                const char* backend = fl_getenv("FLTK_BACKEND");
+                if (backend && strcmp(backend, "x11") == 0)
+                {
+                    out = true;
+                }
             }
         }
 #    endif