Changeset 37434 in vbox

Timestamp:

Jun 14, 2011 1:14:57 PM (13 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard: moved the RTEnvGet("DISPLAY") hack out into the host-specific code

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard.h (modified) (1 diff)
• include/VBox/HostServices/VBoxClipboardSvc.h (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (9 diffs)
• src/VBox/HostServices/SharedClipboard/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxClipboard.h (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -54 +54 @@
 
 /* APIs exported by the X11 backend */
-extern CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend);
+extern CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend, bool fHeadless);
 extern void ClipDestructX11(CLIPBACKEND *pBackend);
 #ifdef __cplusplus

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -51 +51 @@
  * The service functions which are callable by host.
  */
-#define VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE   1
+#define VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE      1
+/** Run headless on the host, i.e. do not touch the host clipboard. */
+#define VBOX_SHARED_CLIPBOARD_HOST_FN_SET_HEADLESS  2
 
 /*

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

@@ -186 +186 @@
     /* Sanity */
     AssertReturn(g_ctx.client == 0, VERR_WRONG_ORDER);
-    g_ctx.pBackend = ClipConstructX11(&g_ctx);
+    g_ctx.pBackend = ClipConstructX11(&g_ctx, false);
     if (!g_ctx.pBackend)
         rc = VERR_NO_MEMORY;

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -44 +44 @@
 
 #include <iprt/types.h>
-#include <iprt/env.h>
 #include <iprt/mem.h>
 #include <iprt/semaphore.h>
@@ -698 +697 @@
  * @note  X11 backend code
  */
-CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend)
+CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend, bool fHeadless)
 {
     int rc;
@@ -704 +703 @@
     CLIPBACKEND *pCtx = (CLIPBACKEND *)
                     RTMemAllocZ(sizeof(CLIPBACKEND));
-    if (pCtx && !RTEnvExist("DISPLAY"))
+    if (pCtx && fHeadless)
     {
         /*
@@ -2241 +2240 @@
 }
 
+static void testNoX11(CLIPBACKEND *pCtx, const char *pcszTestCtx)
+{
+    CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
+    int rc = ClipRequestDataFromX11(pCtx,
+                                    VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                                    pReq);
+    RTTESTI_CHECK_MSG(rc == VERR_NO_DATA, ("context: %s\n", pcszTestCtx));
+}
+
 static void testStringFromVBoxFailed(RTTEST hTest, CLIPBACKEND *pCtx,
                                      const char *pcszTarget)
@@ -2257 +2265 @@
 }
 
+static void testNoSelectionOwnership(CLIPBACKEND *pCtx,
+                                     const char *pcszTestCtx)
+{
+    RTTESTI_CHECK_MSG(!g_ownsSel, ("context: %s\n", pcszTestCtx));
+}
+
 int main()
 {
@@ -2271 +2285 @@
      * Run the test.
      */
-    CLIPBACKEND *pCtx = ClipConstructX11(NULL);
+    CLIPBACKEND *pCtx = ClipConstructX11(NULL, false);
     char *pc;
     uint32_t cbActual;
@@ -2524 +2538 @@
     ClipDestructX11(pCtx);
 
+    /*** Headless clipboard tests ***/
+
+    pCtx = ClipConstructX11(NULL, true);
+    rc = ClipStartX11(pCtx);
+    AssertRCReturn(rc, 1);
+
+    /*** Read from X11 ***/
+    RTTestSub(hTest, "reading from X11, headless clipboard");
+    /* Simple test */
+    clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "",
+                     sizeof("") * 2);
+    clipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world",
+                           sizeof("hello world"), 8);
+    testNoX11(pCtx, "reading from X11, headless clipboard");
+
+    /*** Read from VBox ***/
+    RTTestSub(hTest, "reading from VBox, headless clipboard");
+    /* Simple test */
+    clipEmptyVBox(pCtx, VERR_WRONG_ORDER);
+    clipSetSelectionValues("TEXT", XA_STRING, "", sizeof(""), 8);
+    clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "hello world",
+                     sizeof("hello world") * 2);
+    testNoSelectionOwnership(pCtx, "reading from VBox, headless clipboard");
+
+    rc = ClipStopX11(pCtx);
+    AssertRCReturn(rc, 1);
+    ClipDestructX11(pCtx);
+
     return RTTestSummaryAndDestroy(hTest);
 }
@@ -2536 +2578 @@
  * the command line. */
 
+#include <iprt/env.h>
 #include <iprt/test.h>
 
@@ -2577 +2620 @@
         return RTTestSummaryAndDestroy(hTest);
     }
-    CLIPBACKEND *pCtx = ClipConstructX11(NULL);
+    CLIPBACKEND *pCtx = ClipConstructX11(NULL, false);
     AssertReturn(pCtx, 1);
     rc = ClipStartX11(pCtx);

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -18 +18 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+# Include sub-makefile(s).
+include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
 #

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h

@@ -20 +20 @@
 
 #define LOG_GROUP LOG_GROUP_SHARED_CLIPBOARD
+#include <VBox/hgcmsvc.h>
 #include <VBox/log.h>
 

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

@@ -23 +23 @@
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
+#include <iprt/env.h>
 #include <iprt/mem.h>
 #include <iprt/semaphore.h>
@@ -111 +112 @@
     {
         RTCritSectInit(&pCtx->clipboardMutex);
-        pBackend = ClipConstructX11(pCtx);
+        pBackend = ClipConstructX11(pCtx, !RTEnvGet("DISPLAY"));
         if (pBackend == NULL)
             rc = VERR_NO_MEMORY;
@@ -470 +471 @@
 }
 
-CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend)
+CLIPBACKEND *ClipConstructX11(VBOXCLIPBOARDCONTEXT *pFrontend, bool)
 {
     return (CLIPBACKEND *)RTMemAllocZ(sizeof(CLIPBACKEND));