Changeset 96876 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Sep 26, 2022 4:11:19 PM (2 years ago)

Author:

vboxsync

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

153783

Message:

Additions: X11: Move Wayland env detection to common place, bugref:10134.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• display-svga-x11.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -776 +776 @@
 
 /**
- * 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 isXwayland(void)
-{
-    const char *const pDisplayType = RTEnvGet(VBCL_ENV_WAYLAND_DISPLAY);
-    const char *pSessionType;
-
-    if (pDisplayType != NULL)
-        return true;
-
-    pSessionType = RTEnvGet(VBCL_ENV_XDG_SESSION_TYPE);
-    if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland")))
-        return true;
-
-    return false;
-}
-
-/**
  * @interface_method_impl{VBCLSERVICE,pfnInit}
  */
@@ -819 +798 @@
     }
 
-    if (isXwayland())
+    if (VBClHasWayland())
     {
         rc = VbglR3DrmClientStart();

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -119 +119 @@
 static char          g_szLogFile[RTPATH_MAX + 128] = "";
 
+/**
+ * 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.
+ */
 bool VBClHasWayland(void)
 {
-    return RTEnvGet(VBCL_ENV_WAYLAND_DISPLAY) != NULL;
+    const char *const pDisplayType = RTEnvGet(VBCL_ENV_WAYLAND_DISPLAY);
+    const char *pSessionType;
+
+    if (pDisplayType != NULL)
+        return true;
+
+    pSessionType = RTEnvGet(VBCL_ENV_XDG_SESSION_TYPE);
+    if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland")))
+        return true;
+
+    return false;
 }