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

Timestamp:

Mar 31, 2009 9:10:20 PM (16 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard/X11: added opaque data pointers to the X11 backend APIs, as yet unused

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp (modified) (11 diffs)

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

@@ -54 +54 @@
     RTSEMMUTEX clipboardMutex;
 
+    /** Pointer to the opaque X11 backend structure */
+    VBOXCLIPBOARDCONTEXTX11 *pBackend;
     /** Pointer to the client data structure */
     VBOXCLIPBOARDCLIENTDATA *pClient;
@@ -85 +87 @@
          * data from X11. */
         LogFunc(("host requested guest clipboard data after guest had disconnected.\n"));
-        VBoxX11ClipboardAnnounceVBoxFormat(0);
+        VBoxX11ClipboardAnnounceVBoxFormat(pCtx->pBackend, 0);
         pCtx->waiter = NONE;
         return VERR_TIMEOUT;
@@ -162 +164 @@
 {
     int rc = VINF_SUCCESS;
+    VBOXCLIPBOARDCONTEXTX11 *pBackend = NULL;
+
     LogRel(("Initializing host clipboard service\n"));
     RTSemEventCreate(&g_ctxHost.waitForData);
     RTSemMutexCreate(&g_ctxHost.clipboardMutex);
-    rc = VBoxX11ClipboardInitX11(&g_ctxHost);
+    rc = VBoxX11ClipboardInitX11(&g_ctxHost, &pBackend);
     if (RT_FAILURE(rc))
     {
@@ -172 +176 @@
         LogRel(("Failed to start the host shared clipboard service.\n"));
     }
+    else
+        g_ctxHost.pBackend = pBackend;
     return rc;
 }
@@ -197 +203 @@
      *         even if we are not waiting. */
     RTSemEventSignal(g_ctxHost.waitForData);
-    rc = VBoxX11ClipboardTermX11();
+    rc = VBoxX11ClipboardTermX11(g_ctxHost.pBackend);
     if (RT_SUCCESS(rc))
     {
@@ -225 +231 @@
     /** The pClient pointer is a dummy anyway, as we only support a single
      * client at a time. */
-    rc = VBoxX11ClipboardStartX11(X11 /* initial owner */);
+    rc = VBoxX11ClipboardStartX11(g_ctxHost.pBackend,
+                                  X11 /* initial owner */);
     return rc;
 }
@@ -246 +253 @@
     vboxSvcClipboardReportMsg (g_ctxHost.pClient,
                                VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, 0);
-    VBoxX11ClipboardRequestSyncX11();
+    VBoxX11ClipboardRequestSyncX11(g_ctxHost.pBackend);
 
     return VINF_SUCCESS;
@@ -261 +268 @@
     RTSemMutexRequest(g_ctxHost.clipboardMutex, RT_INDEFINITE_WAIT);
     g_ctxHost.pClient = NULL;
-    VBoxX11ClipboardStopX11();
+    VBoxX11ClipboardStopX11(g_ctxHost.pBackend);
     RTSemMutexRelease(g_ctxHost.clipboardMutex);
 }
@@ -274 +281 @@
 void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Formats)
 {
-    VBoxX11ClipboardAnnounceVBoxFormat (u32Formats);
+    VBoxX11ClipboardAnnounceVBoxFormat (g_ctxHost.pBackend, u32Formats);
 }
 
@@ -302 +309 @@
     request.cb = cb;
     request.pcbActual = pcbActual;
-    rc = VBoxX11ClipboardReadX11Data(u32Format, &request);
+    rc = VBoxX11ClipboardReadX11Data(g_ctxHost.pBackend, u32Format, &request);
     g_ctxHost.waiter = NONE;
     return rc;
@@ -316 +323 @@
  * @note   Host glue code
  */
-void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, uint32_t cb, uint32_t u32Format)
+void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient,
+                             void *pv, uint32_t cb, uint32_t u32Format)
 {
 /* Assume that if this gets called at all then the X11 backend is running. */