Changeset 93505 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

Timestamp:

Jan 31, 2022 4:38:49 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 [VBoxClient fixes].

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (4 diffs)

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

@@ -58 +58 @@
 
 
-DECLCALLBACK(int) ShClX11RequestDataCallback(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb)
-{
+static DECLCALLBACK(int) vbclOnRequestDataFromSourceCallback(PSHCLCONTEXT pCtx,
+                                                             SHCLFORMAT uFmt, void **ppv, uint32_t *pcb, void *pvUser)
+{
+    RT_NOREF(pvUser);
+
     LogFlowFunc(("pCtx=%p, uFmt=%#x\n", pCtx, uFmt));
 
@@ -140 +143 @@
 {
     /** The data format that was requested. */
-    SHCLFORMAT Format;
+    SHCLFORMAT uFmt;
 };
 
-DECLCALLBACK(void) ShClX11ReportFormatsCallback(PSHCLCONTEXT pCtx, SHCLFORMATS fFormats)
-{
-    RT_NOREF(pCtx);
+static DECLCALLBACK(int) vbclReportFormatsCallback(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
+{
+    RT_NOREF(pvUser);
 
     LogFlowFunc(("fFormats=%#x\n", fFormats));
 
-    int rc2 = VbglR3ClipboardReportFormats(pCtx->CmdCtx.idClient, fFormats);
-    RT_NOREF(rc2);
-    LogFlowFuncLeaveRC(rc2);
-}
-
-DECLCALLBACK(void) ShClX11ReportDataCallback(PSHCLCONTEXT pCtx, int rcCompletion,
-                                             CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
-{
-    LogFlowFunc(("rcCompletion=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", rcCompletion, pReq->Format, pv, cb));
-    RT_NOREF(rcCompletion);
+    int rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.idClient, fFormats);
+    LogFlowFuncLeaveRC(rc);
+
+    return rc;
+}
+
+static DECLCALLBACK(int) vbclOnSendDataToDestCallback(PSHCLCONTEXT pCtx, void *pv, uint32_t cb, void *pvUser)
+{
+    PSHCLX11READDATAREQ pData = (PSHCLX11READDATAREQ)pvUser;
+    AssertPtrReturn(pData, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("rcCompletion=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", pData->rcCompletion, pData->pReq->uFmt, pv, cb));
 
     Assert((cb == 0 && pv == NULL) || (cb != 0 && pv != NULL));
-    rcCompletion = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
-
-    RTMemFree(pReq);
-
-    LogFlowFuncLeaveRC(rcCompletion);
+    pData->rcCompletion = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pData->pReq->uFmt, pv, cb);
+
+    RTMemFree(pData->pReq);
+
+    LogFlowFuncLeaveRC(pData->rcCompletion);
+
+    return VINF_SUCCESS;
 }
 
@@ -177 +184 @@
     LogFlowFuncEnter();
 
-    int rc = ShClX11Init(&g_Ctx.X11, NULL /* pCallbacks */, &g_Ctx, false /* fHeadless */);
+    SHCLCALLBACKS Callbacks;
+    RT_ZERO(Callbacks);
+    Callbacks.pfnReportFormats           = vbclReportFormatsCallback;
+    Callbacks.pfnOnRequestDataFromSource = vbclOnRequestDataFromSourceCallback;
+    Callbacks.pfnOnSendDataToDest        = vbclOnSendDataToDestCallback;
+
+    int rc = ShClX11Init(&g_Ctx.X11, &Callbacks, &g_Ctx, false /* fHeadless */);
     if (RT_SUCCESS(rc))
     {
@@ -269 +282 @@
                     if (pReq)
                     {
-                        pReq->Format = pEvent->u.fReadData;
-                        ShClX11ReadDataFromX11(&g_Ctx.X11, pReq->Format, pReq);
+                        pReq->uFmt = pEvent->u.fReadData;
+                        ShClX11ReadDataFromX11(&g_Ctx.X11, pReq->uFmt, pReq);
                     }
                     else