Changeset 37434 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

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

Author:

vboxsync

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

72238

Message:

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

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClipboard.h (modified) (1 diff)
• x11-clipboard.cpp (modified) (3 diffs)

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));