Changeset 106788 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/vboxwl.cpp

Timestamp:

Oct 30, 2024 12:04:20 PM (5 months ago)

Author:

vboxsync

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

165683

Message:

Additions: Linux/Wayland: Rename IPC stuff to be more generic (for both Clipboard and DnD), bugref:10796.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/vboxwl.cpp (modified) (8 diffs)

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

@@ -91 +91 @@
 
 /** Clipboard IPC flow object. */
-vbcl::ipc::clipboard::ClipboardIpc *g_oClipboardIpc;
+vbcl::ipc::data::DataIpc *g_oDataIpc;
 
 
@@ -133 +133 @@
             if (RT_SUCCESS(rc))
             {
-                g_oClipboardIpc->m_pvClipboardBuf.set((uint64_t)pvBufOut);
-                g_oClipboardIpc->m_cbClipboardBuf.set((uint64_t)cbBufOut);
+                g_oDataIpc->m_pvClipboardBuf.set((uint64_t)pvBufOut);
+                g_oDataIpc->m_cbClipboardBuf.set((uint64_t)cbBufOut);
                 g_tsGtkQuit = RTTimeMilliTS();
             }
@@ -225 +225 @@
 
         /* Set formats to be sent to the host. */
-        g_oClipboardIpc->m_fFmts.set(fFormats);
+        g_oDataIpc->m_fFmts.set(fFormats);
 
         /* Wait for host to send clipboard format it wants to copy from guest. */
-        uFmt = g_oClipboardIpc->m_uFmt.wait();
-        if (uFmt != g_oClipboardIpc->m_uFmt.defaults())
+        uFmt = g_oDataIpc->m_uFmt.wait();
+        if (uFmt != g_oDataIpc->m_uFmt.defaults())
         {
             /* Find target which matches to host format among reported by guest. */
@@ -274 +274 @@
 
     /* Set clipboard format which guest wants to send it to the host. */
-    g_oClipboardIpc->m_uFmt.set(uFmt);
+    g_oDataIpc->m_uFmt.set(uFmt);
 
     /* Wait for the host to send clipboard data in requested format. */
-    uint32_t cbBuf = g_oClipboardIpc->m_cbClipboardBuf.wait();
-    void *pvBuf = (void *)g_oClipboardIpc->m_pvClipboardBuf.wait();
-
-    if (   cbBuf != g_oClipboardIpc->m_cbClipboardBuf.defaults()
-        && pvBuf != (void *)g_oClipboardIpc->m_pvClipboardBuf.defaults())
+    uint32_t cbBuf = g_oDataIpc->m_cbClipboardBuf.wait();
+    void *pvBuf = (void *)g_oDataIpc->m_pvClipboardBuf.wait();
+
+    if (   cbBuf != g_oDataIpc->m_cbClipboardBuf.defaults()
+        && pvBuf != (void *)g_oDataIpc->m_pvClipboardBuf.defaults())
     {
         void *pBufOut;
@@ -362 +362 @@
 
     /* Wait for host to report available clipboard formats from its buffer. */
-    fFmts = g_oClipboardIpc->m_fFmts.wait();
-    if (fFmts != g_oClipboardIpc->m_fFmts.defaults())
+    fFmts = g_oDataIpc->m_fFmts.wait();
+    if (fFmts != g_oDataIpc->m_fFmts.defaults())
     {
         GtkTargetList *aTargetList = gtk_target_list_new(0, 0);
@@ -524 +524 @@
 
     if      (g_enmSessionType == VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_GUEST)
-        rc = g_oClipboardIpc->flow(vbcl::ipc::clipboard::HGCopyFlow, hIpcSession);
+        rc = g_oDataIpc->flow(vbcl::ipc::data::HGCopyFlow, hIpcSession);
     else if (g_enmSessionType == VBCL_WL_CLIPBOARD_SESSION_TYPE_ANNOUNCE_TO_HOST)
-        rc = g_oClipboardIpc->flow(vbcl::ipc::clipboard::GHAnnounceAndCopyFlow, hIpcSession);
+        rc = g_oDataIpc->flow(vbcl::ipc::data::GHAnnounceAndCopyFlow, hIpcSession);
     else if (g_enmSessionType == VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_HOST)
-        rc = g_oClipboardIpc->flow(vbcl::ipc::clipboard::GHCopyFlow, hIpcSession);
+        rc = g_oDataIpc->flow(vbcl::ipc::data::GHCopyFlow, hIpcSession);
 
     return rc;
@@ -579 +579 @@
         if (RT_SUCCESS(rc))
         {
-            g_oClipboardIpc = new vbcl::ipc::clipboard::ClipboardIpc();
-            if (RT_VALID_PTR(g_oClipboardIpc))
+            g_oDataIpc = new vbcl::ipc::data::DataIpc();
+            if (RT_VALID_PTR(g_oDataIpc))
             {
-                g_oClipboardIpc->init(vbcl::ipc::FLOW_DIRECTION_CLIENT, g_uSessionId);
+                g_oDataIpc->init(vbcl::ipc::FLOW_DIRECTION_CLIENT, g_uSessionId);
 
                 rc = vboxwl_ipc_flow(hIpcSession);
@@ -596 +596 @@
                             g_uSessionId, rc, rcThread);
 
-                g_oClipboardIpc->reset();
-                delete g_oClipboardIpc;
+                g_oDataIpc->reset();
+                delete g_oDataIpc;
             }
             else