Changeset 58212 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Oct 13, 2015 11:49:33 AM (10 years ago)

Author:

vboxsync

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

103344

Message:

DnD: Updates.

• Introduced protocol changelog in DragAndDropSvc.h.
• Implemented protocol v3 with HOST_DND_HG_SND_DATA_HDR message for doing proper object accounting, among other parameters like checksumming and compression flags.
• Encapsulated a lot of functionality in class hierarchies.
• Renamed a lot of functions to make the usage more clear.
• Various other bugfixes.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (5 diffs)

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

@@ -939 +939 @@
                     uAction = toHGCMAction(static_cast<Atom>(e.xclient.data.l[XdndStatusAction]));
 
-                rc = VbglR3DnDHGAcknowledgeOperation(&m_dndCtx, uAction);
+                rc = VbglR3DnDHGSendAckOp(&m_dndCtx, uAction);
             }
             else if (e.xclient.message_type == xAtom(XA_XdndFinished))
@@ -1821 +1821 @@
     {
         /* No window to process, so send a ignore ack event to the host. */
-        rc = VbglR3DnDHGAcknowledgeOperation(&m_dndCtx, DND_IGNORE_ACTION);
+        rc = VbglR3DnDHGSendAckOp(&m_dndCtx, DND_IGNORE_ACTION);
     }
     else
@@ -1866 +1866 @@
     char szFormat[] = { "text/uri-list" };
 
-    int rc = VbglR3DnDHGRequestData(&m_dndCtx, szFormat);
+    int rc = VbglR3DnDHGSendReqData(&m_dndCtx, szFormat);
     logInfo("Drop event from host resuled in: %Rrc\n", rc);
 
@@ -2074 +2074 @@
     }
 
-    rc2 = VbglR3DnDGHAcknowledgePending(&m_dndCtx, uDefAction, uAllActions, strFormats.c_str());
+    rc2 = VbglR3DnDGHSendAckPending(&m_dndCtx, uDefAction, uAllActions,
+                                    strFormats.c_str(), strFormats.length() + 1 /* Include termination */);
     LogFlowThisFunc(("uClientID=%RU32, uDefAction=0x%x, allActions=0x%x, strFormats=%s, rc=%Rrc\n",
                      m_dndCtx.uClientID, uDefAction, uAllActions, strFormats.c_str(), rc2));
@@ -3196 +3197 @@
 
         /* Wait for new events. */
-        rc = VbglR3DnDProcessNextMessage(&dndCtx, &e.hgcm);
+        rc = VbglR3DnDRecvNextMsg(&dndCtx, &e.hgcm);
         if (   RT_SUCCESS(rc)
             || rc == VERR_CANCELLED)