Changeset 84369 in vbox for trunk/src

Timestamp:

May 19, 2020 11:58:56 AM (5 years ago)

Author:

vboxsync

Message:

Linux/GA/X11: ticketref:19590 VBoxClient: The parent session seems to be non-X11

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -655 +655 @@
 
 /**
- * Tries to determine if the session parenting this process is of X11.
+ * Tries to determine if the session parenting this process is of Xwayland.
+ * NB: XDG_SESSION_TYPE is a systemd(1) environment variable and is unlikely
+ * set in non-systemd environments or remote logins.
+ * Therefore we check the Wayland specific display environment variable first.
  */
-static bool isX11()
-{
-    char* pSessionType;
+static bool isXwayland(void)
+{
+    const char *const pDisplayType = getenv("WAYLAND_DISPLAY");
+    const char *pSessionType;
+
+    if (pDisplayType != NULL) {
+        return true;
+    }
     pSessionType = getenv("XDG_SESSION_TYPE");
-    if (pSessionType != NULL)
-    {
-        if (RTStrIStartsWith(pSessionType, "x11"))
-            return true;
+    if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland"))) {
+        return true;
     }
     return false;
@@ -671 +677 @@
 static bool init()
 {
-    if (!isX11())
+    if (isXwayland())
     {
         VBClLogFatalError("The parent session seems to be non-X11. Exiting...\n");