Changeset 100216 in vbox

Timestamp:

Jun 19, 2023 5:31:13 PM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157926

Message:

GuestHost: VBGHDisplayServerTypeDetect: Do not rely on environment variables when detecting X11/XWayland/Wayland, bugref:10427.

File:

• trunk/src/VBox/GuestHost/DisplayServerType.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/DisplayServerType.cpp

@@ -200 +200 @@
     LogRel2(("Detected via connection: %s\n", VBGHDisplayServerTypeToStr(retSessionType)));
 
-    /* If retSessionType is set, we assume we're done here;
-     * otherwise try the environment variables as a fallback. */
-    if (retSessionType != VBGHDISPLAYSERVERTYPE_NONE)
-        return retSessionType;
-
-    /*
-     * 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.
-     */
-    VBGHDISPLAYSERVERTYPE waylandDisplayType = VBGHDISPLAYSERVERTYPE_NONE;
-    const char *const pWaylandDisplayType = RTEnvGet(VBGH_ENV_WAYLAND_DISPLAY);
-    if (pWaylandDisplayType != NULL)
-        waylandDisplayType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
-
-    LogRel2(("Wayland display type is: %s\n", VBGHDisplayServerTypeToStr(waylandDisplayType)));
-
-    VBGHDISPLAYSERVERTYPE xdgSessionType = VBGHDISPLAYSERVERTYPE_NONE;
-    const char *pSessionType = RTEnvGet(VBGH_ENV_XDG_SESSION_TYPE);
-    if (pSessionType)
-    {
-        if (RTStrIStartsWith(pSessionType, "wayland"))
-            xdgSessionType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
-        else if (RTStrIStartsWith(pSessionType, "x11"))
-            xdgSessionType = VBGHDISPLAYSERVERTYPE_X11;
-    }
-
-    LogRel2(("XDG session type is: %s\n", VBGHDisplayServerTypeToStr(xdgSessionType)));
-
-    VBGHDISPLAYSERVERTYPE xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_NONE;
-
-    const char *pszCurDesktop = RTEnvGet(VBGH_ENV_XDG_CURRENT_DESKTOP);
-    if (pszCurDesktop)
-    {
-        if (RTStrIStr(pszCurDesktop, "wayland"))
-            xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
-        else if (RTStrIStr(pszCurDesktop, "x11"))
-            xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_X11;
-    }
-
-    LogRel2(("XDG current desktop type is: %s\n", VBGHDisplayServerTypeToStr(xdgCurrentDesktopType)));
-
-    /* Set the returning type according to the precedence. */
-    if      (waylandDisplayType    != VBGHDISPLAYSERVERTYPE_NONE) retSessionType = waylandDisplayType;
-    else if (xdgSessionType        != VBGHDISPLAYSERVERTYPE_NONE) retSessionType = xdgSessionType;
-    else if (xdgCurrentDesktopType != VBGHDISPLAYSERVERTYPE_NONE) retSessionType = xdgCurrentDesktopType;
-    else                                                    retSessionType = VBGHDISPLAYSERVERTYPE_NONE;
-
-    /* Try to detect any mismatches between the variables above.
-     * This might indicate a misconfigred / broken system, and we can warn the user then. */
-#define COMPARE_SESSION_TYPES(a_Type1, a_Type2) \
-    if (   (a_Type1 != VBGHDISPLAYSERVERTYPE_NONE) \
-        && (a_Type2 != VBGHDISPLAYSERVERTYPE_NONE) \
-        && (a_Type1 != a_Type2)) \
-        { \
-            LogRel(("Unable to reliably detect desktop environment:\n")); \
-            LogRel(("Mismatch between %s (%s) and %s (%s) detected! This might indicate a misconfigured and/or broken system!\n", \
-                    #a_Type1, VBGHDisplayServerTypeToStr(a_Type1), #a_Type2, VBGHDisplayServerTypeToStr(a_Type2))); \
-            LogRel(("Use --session-type to override this detection.\n")); \
-            retSessionType = VBGHDISPLAYSERVERTYPE_NONE; \
-        }
-
-    COMPARE_SESSION_TYPES(waylandDisplayType, xdgSessionType);
-    COMPARE_SESSION_TYPES(waylandDisplayType, xdgCurrentDesktopType);
-    COMPARE_SESSION_TYPES(xdgSessionType, xdgCurrentDesktopType);
-
-#undef COMPARE_SESSION_TYPES
-
     return retSessionType;
 }