Changeset 93497 in vbox for trunk/src

Timestamp:

Jan 31, 2022 1:29:28 PM (3 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Implemented backend callbacks and a dedicated backend context, together with a new testcase which mocks HGCM to also test the guest-side clipboard code (disabled by default for now). Work in progress, only tested on Linux so far [build fix].

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (3 diffs)

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

@@ -1824 +1824 @@
         return False;
 
-    XSelectionRequestEvent* req =
-        XtGetSelectionRequest(widget, *atomSelection, (XtRequestId)NULL);
-
     /* Is this the rigt selection (clipboard) we were asked for? */
     if (!clipIsSupportedSelectionType(pCtx, *atomSelection))
@@ -1839 +1836 @@
                                   pValReturn, pcLenReturn, piFormatReturn);
 
-
+#ifdef LOG_ENABLED
+    XSelectionRequestEvent* pReq =
+        XtGetSelectionRequest(widget, *atomSelection, (XtRequestId)NULL);
     LogFlowFunc(("returning pVBoxWnd=%#x, ownerWnd=%#x, reqWnd=%#x, %RTbool, rc=%Rrc\n",
-                 XtWindow(pCtx->pWidget), req->owner, req->requestor, RT_SUCCESS(rc), rc));
+                 XtWindow(pCtx->pWidget), pReq->owner, pReq->requestor, RT_SUCCESS(rc), rc));
+#endif
     return RT_SUCCESS(rc) ? True : False;
 }

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

@@ -322 +322 @@
 }
 
-/** @copydoc SHCLBACKENDCALLBACKS::pfnReportFormats */
+/** @copydoc SHCLCALLBACKS::pfnReportFormats */
 static DECLCALLBACK(int) shClReportFormatsCallback(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
 {
@@ -352 +352 @@
 }
 
-/** @copydoc SHCLBACKENDCALLBACKS::pfnOnSendDataToDest */
+/** @copydoc SHCLCALLBACKS::pfnOnSendDataToDest */
 static DECLCALLBACK(int) shClSendDataToDestCallback(PSHCLCONTEXT pCtx, void *pv, uint32_t cb, void *pvUser)
 {
@@ -402 +402 @@
 }
 
-/** @copydoc SHCLBACKENDCALLBACKS::pfnOnRequestDataFromSource */
+/** @copydoc SHCLCALLBACKS::pfnOnRequestDataFromSource */
 static DECLCALLBACK(int) shClRequestDataFromSourceCallback(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb, void *pvUser)
 {