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

Timestamp:

Feb 2, 2022 6:58:31 PM (3 years ago)

Author:

vboxsync

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

149681

Message:

Additions: X11: VBoxClient: move Wayland detection function into common place, bugref:10134.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

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

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

@@ -27 +27 @@
 #include <iprt/string.h>
 
+/** Environment variable which is exported when in Wayland Desktop Environment. */
+#define VBCL_ENV_WAYLAND_DISPLAY    "WAYLAND_DISPLAY"
+
 void VBClLogInfo(const char *pszFormat, ...);
 void VBClLogError(const char *pszFormat, ...);
@@ -35 +38 @@
 void VBClLogSetLogPrefix(const char *pszPrefix);
 void VBClLogDestroy(void);
+
+/**
+ * Detect if user is running on Wayland by checking corresponding environment variable.
+ *
+ * @returns True if Wayland has been detected, False otherwise.
+ */
+extern bool VBClHasWayland(void);
 
 /** Call clean-up for the current service and exit. */

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

@@ -926 +926 @@
 
 /**
- * Detect if user is running on Wayland by checking corresponding environment variable.
- *
- * @returns True if Wayland has been detected, False otherwise.
- */
-static bool vbcl_hlp_gnome3_has_wayland(void)
-{
-    return RTEnvGet(VBCL_HLP_ENV_WAYLAND_DISPLAY) != NULL;
-}
-
-/**
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnInit}
  */
@@ -942 +932 @@
     int rc;
 
-    if (!vbcl_hlp_gnome3_has_wayland())
+    if (!VBClHasWayland())
     {
         rc = vbcl_hlp_generic_init();
@@ -958 +948 @@
     int rc;
 
-    if (!vbcl_hlp_gnome3_has_wayland())
+    if (!VBClHasWayland())
     {
         rc = vbcl_hlp_generic_term();

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

@@ -26 +26 @@
 /** Environment variable which contains information about currently running Desktop Environment. */
 #define VBCL_HLP_ENV_XDG_CURRENT_DESKTOP    "XDG_CURRENT_DESKTOP"
-/** Environment variable which is exported when in Wayland Desktop Environment. */
-#define VBCL_HLP_ENV_WAYLAND_DISPLAY        "WAYLAND_DISPLAY"
 
 /**

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

@@ -34 +34 @@
 #include <iprt/path.h>
 #include <iprt/stream.h>
+#include <iprt/env.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/err.h>
@@ -107 +108 @@
 static char          g_szLogFile[RTPATH_MAX + 128] = "";
 
+bool VBClHasWayland(void)
+{
+    return RTEnvGet(VBCL_ENV_WAYLAND_DISPLAY) != NULL;
+}
+
 /**
  * Shut down if we get a signal or something.