Changeset 11382 in vbox for trunk

Timestamp:

Aug 13, 2008 11:56:52 AM (16 years ago)

Author:

vboxsync

Message:

shared clipboard: fail silently if we are not running on an X11 server (test for the DISPLAY variable)

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedClipboard/x11.cpp

@@ -32 +32 @@
 #include <iprt/asm.h>        /* For atomic operations */
 #include <iprt/assert.h>
+#include <iprt/env.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
@@ -167 +168 @@
 /* Only one client is supported. There seems to be no need for more clients. */
 static VBOXCLIPBOARDCONTEXT g_ctx;
+
+/* Are we actually connected to the X11 servicer? */
+static bool g_fHaveX11;
 
 /**
@@ -775 +779 @@
     int rc;
 
+    if (!RTEnvGet("DISPLAY"))
+    {
+        /*
+         * If we don't find the DISPLAY environment variable we assume that we are not
+         * connected to an X11 server. Don't actually try to do this then, just fail
+         * silently and report success on every call. This is important for VBoxHeadless.
+         */
+        LogRel(("vboxClipboardInit: no X11 detected -- host clipboard disabled\n"));
+        g_fHaveX11 = false;
+        return VINF_SUCCESS;
+    }
+
+    g_fHaveX11 = true;
+
     LogRel(("vboxClipboardInit: initializing host clipboard\n"));
     RTSemEventCreate(&g_ctx.waitForData);
@@ -793 +811 @@
 void vboxClipboardDestroy (void)
 {
-    LogRel(("vboxClipboardDestroy: shutting down host clipboard\n"));
     int rc, rcThread;
     unsigned count = 0;
     XEvent ev;
+
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+        return;
+
+    LogRel(("vboxClipboardDestroy: shutting down host clipboard\n"));
 
     /* Set the termination flag. */
@@ -828 +853 @@
 int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient)
 {
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+        return VINF_SUCCESS;
+
     LogFlow(("vboxClipboardConnect\n"));
 
@@ -850 +881 @@
 int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA *pClient)
 {
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+        return VINF_SUCCESS;
+
     /* On a Linux host, the guest should never synchronise/cache its clipboard contents, as
        we have no way of reliably telling when the host clipboard data changes.  So instead
@@ -865 +902 @@
 void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
 {
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+        return;
+
     LogFlow(("vboxClipboardDisconnect\n"));
 
@@ -1306 +1349 @@
 void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Formats)
 {
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+        return;
+
     pClient->pCtx->guestFormats = u32Formats;
     LogFlowFunc (("u32Formats=%d\n", u32Formats));
@@ -1353 +1402 @@
                            uint32_t cb, uint32_t *pcbActual)
 {
+    /*
+     * Immetiately return if we are not connected to the host X server.
+     */
+    if (!g_fHaveX11)
+    {
+        /* no data available */
+        *pcbActual = 0;
+        return VINF_SUCCESS;
+    }
+
     LogFlow(("vboxClipboardReadData: u32Format = %d, cb = %d\n", u32Format, cb));
 
@@ -1409 +1468 @@
 void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, uint32_t cb, uint32_t u32Format)
 {
+    if (!g_fHaveX11)
+        return;
+
     LogFlow(("vboxClipboardWriteData\n"));