Changeset 101943 in vbox

Timestamp:

Nov 7, 2023 2:00:47 PM (15 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: Add --check switch to vboxwl which should tell startup script either X11 or Wayland version of VBoxClient should be started, bugref:10194.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/vboxwl.cpp (modified) (4 diffs)

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

@@ -634 +634 @@
     RTPrintf("  %-20s Copy content from clipboard\n", VBOXWL_ARG_CLIP_GH_COPY);
 
+    RTPrintf("  --check              Check if active Wayland session is running\n");
     RTPrintf("  --verbose            Increase verbosity level\n");
     RTPrintf("  --version            Print version number and exit\n");
@@ -643 +644 @@
 
 /**
+ * Check if active Wayland session is running.
+ *
+ * This check is used in order to detect whether X11 or Wayland
+ * version of VBoxClient should be started when user logs-in.
+ * It will print out either WL or X11 and exit. Startup script(s)
+ * should rely on this output.
+ */
+static void vboxwl_check(void)
+{
+    VBGHDISPLAYSERVERTYPE enmType = VBGHDisplayServerTypeDetect();
+    bool fWayland = false;
+
+    /* In pure Wayland environment X11 version of VBoxClient will not
+     * work, so fallback on Wayland version. */
+    if (enmType == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
+        fWayland = true;
+    else if (enmType == VBGHDISPLAYSERVERTYPE_XWAYLAND)
+    {
+        /* In case of XWayland, X11 version of VBoxClient still can
+         * work, however with some DEs, such as Plasma on Wayland,
+         * this will no longer work. Detect such DEs here. */
+
+        /* Try to detect Plasma. */
+        const char *pcszDesktopSession = RTEnvGet(VBGH_ENV_DESKTOP_SESSION);
+        if (RT_VALID_PTR(pcszDesktopSession) && RTStrIStr(pcszDesktopSession, "plasmawayland"))
+            fWayland = true;
+    }
+
+    RTPrintf("%s\n", fWayland ? "WL" : "X11");
+    exit (0);
+}
+
+/**
  * Print version and exit.
  */
@@ -666 +700 @@
         { VBOXWL_ARG_CLIP_GH_COPY,      'c', RTGETOPT_REQ_NOTHING },
         { VBOXWL_ARG_SESSION_ID,        's', RTGETOPT_REQ_UINT32  },
+        { "--check",                    'C', RTGETOPT_REQ_NOTHING },
         { "--help",                     'h', RTGETOPT_REQ_NOTHING },
         { "--version",                  'V', RTGETOPT_REQ_NOTHING },
@@ -710 +745 @@
                 }
 
+                case 'C':
+                {
+                    vboxwl_check();
+                    break;
+                }
+
                 case 'h':
                 {