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

Timestamp:

Sep 21, 2018 3:36:16 PM (7 years ago)

Author:

vboxsync

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

125245

Message:

DnD: Renamed action names, added typedefs for DnD actions.

File:

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

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

@@ -951 +951 @@
 #endif
 
-                uint32_t uAction = DND_IGNORE_ACTION; /* Default is ignoring. */
+                uint32_t uAction = VBOX_DND_ACTION_IGNORE; /* Default is ignoring. */
                 /** @todo Compare this with the allowed actions. */
                 if (fAcceptDrop)
@@ -1111 +1111 @@
 
                 /** @todo Handle default action! */
-                m.data.l[XdndStatusAction]  = fAcceptDrop ? toAtomAction(DND_COPY_ACTION) : None;
+                m.data.l[XdndStatusAction]  = fAcceptDrop ? toAtomAction(VBOX_DND_ACTION_COPY) : None;
 
                 int xRc = XSendEvent(m_pDisplay, e.xclient.data.l[XdndPositionWindow],
@@ -1139 +1139 @@
 
                     /* Let the source know. */
-                    rc = m_wndProxy.sendFinished(m_wndCur, DND_IGNORE_ACTION);
+                    rc = m_wndProxy.sendFinished(m_wndCur, VBOX_DND_ACTION_IGNORE);
 
                     /* Start over. */
@@ -1154 +1154 @@
 
                 /* Let the source know. */
-                rc = m_wndProxy.sendFinished(m_wndCur, DND_IGNORE_ACTION);
+                rc = m_wndProxy.sendFinished(m_wndCur, VBOX_DND_ACTION_IGNORE);
 
                 /* Start over. */
@@ -1843 +1843 @@
     {
         /* No window to process, so send a ignore ack event to the host. */
-        rc = VbglR3DnDHGSendAckOp(&m_dndCtx, DND_IGNORE_ACTION);
+        rc = VbglR3DnDHGSendAckOp(&m_dndCtx, VBOX_DND_ACTION_IGNORE);
     }
     else
@@ -1995 +1995 @@
 
     RTCString strFormats = "\r\n"; /** @todo If empty, IOCTL fails with VERR_ACCESS_DENIED. */
-    uint32_t uDefAction  = DND_IGNORE_ACTION;
-    uint32_t uAllActions = DND_IGNORE_ACTION;
+    uint32_t uDefAction  = VBOX_DND_ACTION_IGNORE;
+    uint32_t uAllActions = VBOX_DND_ACTION_IGNORE;
 
     /* Currently in wrong mode? Bail out. */
@@ -2097 +2097 @@
         {
             strFormats   = strFormatsCur;
-            uDefAction   = DND_COPY_ACTION; /** @todo Handle default action! */
-            uAllActions  = DND_COPY_ACTION; /** @todo Ditto. */
+            uDefAction   = VBOX_DND_ACTION_COPY; /** @todo Handle default action! */
+            uAllActions  = VBOX_DND_ACTION_COPY; /** @todo Ditto. */
             uAllActions |= toHGCMActions(m_lstActions);
         }
@@ -2295 +2295 @@
                     /* Cancel the operation -- inform the source window by
                      * sending a XdndFinished message so that the source can toss the required data. */
-                    rc = m_wndProxy.sendFinished(wndSource, DND_IGNORE_ACTION);
+                    rc = m_wndProxy.sendFinished(wndSource, VBOX_DND_ACTION_IGNORE);
                 }
 
@@ -2863 +2863 @@
 uint32_t DragInstance::toHGCMAction(Atom atom)
 {
-    uint32_t uAction = DND_IGNORE_ACTION;
+    uint32_t uAction = VBOX_DND_ACTION_IGNORE;
 
     if (atom == xAtom(XA_XdndActionCopy))
-        uAction = DND_COPY_ACTION;
+        uAction = VBOX_DND_ACTION_COPY;
     else if (atom == xAtom(XA_XdndActionMove))
-        uAction = DND_MOVE_ACTION;
+        uAction = VBOX_DND_ACTION_MOVE;
     else if (atom == xAtom(XA_XdndActionLink))
-        uAction = DND_LINK_ACTION;
+        uAction = VBOX_DND_ACTION_LINK;
 
     return uAction;
@@ -2884 +2884 @@
 uint32_t DragInstance::toHGCMActions(const VBoxDnDAtomList &lstActions)
 {
-    uint32_t uActions = DND_IGNORE_ACTION;
+    uint32_t uActions = VBOX_DND_ACTION_IGNORE;
 
     for (size_t i = 0; i < lstActions.size(); i++)
@@ -2932 +2932 @@
 {
     /* Was the drop accepted by the host? That is, anything than ignoring. */
-    bool fDropAccepted = uAction > DND_IGNORE_ACTION;
+    bool fDropAccepted = uAction > VBOX_DND_ACTION_IGNORE;
 
     LogFlowFunc(("uAction=%RU32\n", uAction));