Changeset 96875 in vbox for trunk

Timestamp:

Sep 26, 2022 3:57:16 PM (2 years ago)

Author:

vboxsync

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

153782

Message:

Aditions: X11: Consolidate all the environment variables we use at one place, bugref:10134.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (1 diff)
• display-helper-gnome3.cpp (modified) (1 diff)
• display-helper.h (modified) (1 diff)
• display-svga-x11.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -38 +38 @@
 
 /** Environment variable which is exported when in Wayland Desktop Environment. */
-#define VBCL_ENV_WAYLAND_DISPLAY    "WAYLAND_DISPLAY"
+#define VBCL_ENV_WAYLAND_DISPLAY        "WAYLAND_DISPLAY"
+/** Environment variable which contains information about currently running Desktop Environment. */
+#define VBCL_ENV_XDG_CURRENT_DESKTOP    "XDG_CURRENT_DESKTOP"
+/** Environment variable which contains information about currently running session (X11, Wayland, etc). */
+#define VBCL_ENV_XDG_SESSION_TYPE       "XDG_SESSION_TYPE"
 
 void VBClLogInfo(const char *pszFormat, ...);

trunk/src/VBox/Additions/x11/VBoxClient/display-helper-gnome3.cpp

@@ -964 +964 @@
 static DECLCALLBACK(int) vbcl_hlp_gnome3_probe(void)
 {
-    const char *pszCurrentDesktop = RTEnvGet(VBCL_HLP_ENV_XDG_CURRENT_DESKTOP);
+    const char *pszCurrentDesktop = RTEnvGet(VBCL_ENV_XDG_CURRENT_DESKTOP);
 
     /* GNOME3 identifies itself by XDG_CURRENT_DESKTOP environment variable.

trunk/src/VBox/Additions/x11/VBoxClient/display-helper.h

@@ -33 +33 @@
 
 #include "display-ipc.h"
-
-/** Environment variable which contains information about currently running Desktop Environment. */
-#define VBCL_HLP_ENV_XDG_CURRENT_DESKTOP    "XDG_CURRENT_DESKTOP"
 
 /**

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

@@ -70 +70 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
+#include <iprt/env.h>
 
 #include <X11/Xlibint.h>
@@ -782 +783 @@
 static bool isXwayland(void)
 {
-    const char *const pDisplayType = getenv("WAYLAND_DISPLAY");
+    const char *const pDisplayType = RTEnvGet(VBCL_ENV_WAYLAND_DISPLAY);
     const char *pSessionType;
 
@@ -788 +789 @@
         return true;
 
-    pSessionType = getenv("XDG_SESSION_TYPE"); /** @todo r=andy Use RTEnv API. */
+    pSessionType = RTEnvGet(VBCL_ENV_XDG_SESSION_TYPE);
     if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland")))
         return true;