Changeset 108787 in vbox for trunk/src

Timestamp:

Mar 28, 2025 7:34:05 PM (2 weeks ago)

Author:

vboxsync

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

168222

Message:

Additions: Linux/Wayland/VBoxClient: Add IPC workflow definitions for DnD, bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• wayland-helper-ipc.cpp (modified) (5 diffs)
• wayland-helper-ipc.h (modified) (7 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp

@@ -153 +153 @@
 }
 
-int vbcl::ipc::packet_read(uint32_t uSessionId, RTLOCALIPCSESSION hSession, void **ppvData)
+int vbcl::ipc::packet_read(uint32_t uSessionId, RTLOCALIPCSESSION hSession, uint32_t msTimeout, void **ppvData)
 {
     int rc;
@@ -161 +161 @@
     AssertPtrReturn(ppvData, VERR_INVALID_PARAMETER);
 
-    rc = RTLocalIpcSessionWaitForData(hSession, VBOX_GTKIPC_RX_TIMEOUT_MS);
+    rc = RTLocalIpcSessionWaitForData(hSession, msTimeout);
     if (RT_SUCCESS(rc))
     {
@@ -285 +285 @@
     SHCLFORMATS fFormats = VBOX_SHCL_FMT_NONE;
 
-    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, (void **)&pPacket);
+    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, m_fFmts.timeout(), (void **)&pPacket);
     if (RT_SUCCESS(rc))
     {
@@ -342 +342 @@
     SHCLFORMATS uFormat = VBOX_SHCL_FMT_NONE;
 
-    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, (void **)&pPacket);
+    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, m_uFmt.timeout(), (void **)&pPacket);
     if (RT_SUCCESS(rc))
     {
@@ -409 +409 @@
     uint32_t cbData = 0;
 
-    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, (void **)&pPacket);
+    rc = vbcl::ipc::packet_read(uSessionId, hIpcSession, m_pvDataBuf.timeout(), (void **)&pPacket);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h

@@ -63 +63 @@
 /** IPC server socket name prefixes. */
 #define VBOXWL_SRV_NAME_PREFIX_CLIP     "clip"
+#define VBOXWL_SRV_NAME_PREFIX_DND      "dnd"
 
 /** Arguments to vboxwl tool. */
@@ -68 +69 @@
 #define VBOXWL_ARG_CLIP_GH_ANNOUNCE     "--clip-gh-announce"
 #define VBOXWL_ARG_CLIP_GH_COPY         "--clip-gh-copy"
+#define VBOXWL_ARG_DND_GH               "--dnd-gh"
+#define VBOXWL_ARG_DND_HG               "--dnd-hg"
 #define VBOXWL_ARG_SESSION_ID           "--session-id"
 
@@ -147 +150 @@
          * @param   uSessionId      IPC session ID.
          * @param   hSession        IPC session handle.
+         * @param   mcTimeout       Read operation timeout in milliseconds.
          * @param   ppvData         Output buffer structured as validated
          *                          IPC packet (contains size inside).
          */
-        int packet_read(uint32_t uSessionId, RTLOCALIPCSESSION hSession, void **ppvData);
+        int packet_read(uint32_t uSessionId, RTLOCALIPCSESSION hSession, uint32_t msTimeout, void **ppvData);
 
         /**
@@ -195 +199 @@
              */
 
-            /** IPC flow description: Copy clipboard from host to guest. */
+            /** IPC flow description (clipboard): Copy clipboard from host to guest. */
             const flow_t HGCopyFlow[4] =
             {
@@ -204 +208 @@
             };
 
-            /** IPC flow description: Copy clipboard from guest to host. */
+            /** IPC flow description (clipboard): Copy clipboard from guest to host. */
             const flow_t GHCopyFlow[3] =
             {
@@ -212 +216 @@
             };
 
-            /** IPC flow description: Announce guest's clipboard to the host
+            /** IPC flow description (clipboard): Announce guest's clipboard to the host
              *  and copy it to the host in format selected by host. */
             const flow_t GHAnnounceAndCopyFlow[4] =
@@ -219 +223 @@
                 { VBOX_FORMAT,  FLOW_DIRECTION_CLIENT },
                 { VBOX_DATA,    FLOW_DIRECTION_SERVER },
+                { CMD_MAX,      false }
+            };
+
+            /** IPC flow description (DnD): DnD operation started inside guest and
+             *  guest reports DnD content mime-type list. Host side picks up one
+             *  of the formats and requests data in this format. Guest sends
+             *  data in requested format. */
+            const flow_t GHDragFlow[4] =
+            {
+                { VBOX_FORMATS, FLOW_DIRECTION_SERVER },
+                { VBOX_FORMAT,  FLOW_DIRECTION_CLIENT },
+                { VBOX_DATA,    FLOW_DIRECTION_SERVER },
+                { CMD_MAX,      false }
+            };
+
+            /** IPC flow description (DnD): DnD operation started on host and
+             *  host reports DnD content mime-type list. Guest side picks up one
+             *  of the formats and requests data in this format. Host sends
+             *  data in requested format. */
+            const flow_t HGDragFlow[4] =
+            {
+                { VBOX_FORMATS, FLOW_DIRECTION_CLIENT },
+                { VBOX_FORMAT,  FLOW_DIRECTION_SERVER },
+                { VBOX_DATA,    FLOW_DIRECTION_CLIENT },
                 { CMD_MAX,      false }
             };