Changeset 37472 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jun 15, 2011 4:15:34 PM (14 years ago)

Author:

vboxsync

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

72288

Message:

HostServices/SharedClipboard: use headless attribute (X11 only)

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxClipboard-win.cpp (modified) (1 diff)
• VBoxClipboard.h (modified) (1 diff)
• darwin.cpp (modified) (1 diff)
• service.cpp (modified) (3 diffs)
• testcase/tstClipboardServiceHost.cpp (modified) (1 diff)
• x11-clipboard.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp

@@ -612 +612 @@
 }
 
-int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient)
+int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, bool)
 {
     Log(("vboxClipboardConnect\n"));

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

@@ -82 +82 @@
 void vboxClipboardDestroy (void);
 
-int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient);
+int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, bool fHeadless);
 void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient);
 

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

@@ -153 +153 @@
  * @returns RT status code
  */
-int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient)
+int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, bool)
 {
     if (g_ctx.pClient != NULL)

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

@@ -362 +362 @@
     pClient->u32ClientID = u32ClientID;
 
-    rc = vboxClipboardConnect (pClient);
+    rc = vboxClipboardConnect (pClient, vboxSvcClipboardGetHeadless());
 
     if (RT_SUCCESS (rc))
@@ -726 +726 @@
         {
             uint32_t u32Headless = g_fHeadless;
-            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE\n"));
 
             rc = VERR_INVALID_PARAMETER;
@@ -732 +731 @@
                 break;
             rc = VBoxHGCMParmUInt32Get (&paParms[0], &u32Headless);
+            if (RT_SUCCESS(rc))
+                LogRelFlow(("svcCall: VBOX_SHARED_CLIPBOARD_HOST_FN_SET_HEADLESS, u32Headless=%u\n",
+                            (unsigned) u32Headless));
             g_fHeadless = RT_BOOL(u32Headless);
         } break;

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -154 +154 @@
 void vboxClipboardDestroy() { AssertFailed(); }
 void vboxClipboardDisconnect(_VBOXCLIPBOARDCLIENTDATA*) { AssertFailed(); }
-int vboxClipboardConnect(_VBOXCLIPBOARDCLIENTDATA*)
+int vboxClipboardConnect(_VBOXCLIPBOARDCLIENTDATA*, bool)
 { AssertFailed(); return VERR_WRONG_ORDER; }
 void vboxClipboardFormatAnnounce(_VBOXCLIPBOARDCLIENTDATA*, unsigned int)

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

@@ -99 +99 @@
  *        the clipboard and leave ownership to X11.
  */
-int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient)
+int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, bool fHeadless)
 {
     int rc = VINF_SUCCESS;
@@ -112 +112 @@
     {
         RTCritSectInit(&pCtx->clipboardMutex);
-        pBackend = ClipConstructX11(pCtx, !RTEnvGet("DISPLAY"));
+        pBackend = ClipConstructX11(pCtx, fHeadless);
         if (pBackend == NULL)
             rc = VERR_NO_MEMORY;
@@ -512 +512 @@
     RTPrintf(TEST_NAME ": TESTING\n");
     AssertRCReturn(rc, 1);
-    rc = vboxClipboardConnect(&client);
+    rc = vboxClipboardConnect(&client, false);
     CLIPBACKEND *pBackend = client.pCtx->pBackend;
     AssertRCReturn(rc, 1);