Changeset 58329 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 20, 2015 10:05:12 AM (9 years ago)

Author:

vboxsync

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

103528

Message:

DnD: Updates/bugfixes:

• Added separate VBOXDNDDISCONNECTMSG message for letting Main know about client disconnects.
• Various cleanups and bugfixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIDnDHandler.cpp (modified) (14 diffs)
• UIDnDHandler.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp

@@ -75 +75 @@
     : m_pSession(pSession)
     , m_pParent(pParent)
-    , m_enmMode(DNDMODE_UNKNOWN)
+    , m_enmOpMode(DNDMODE_UNKNOWN)
     , m_fIsPending(false)
     , m_fDataRetrieved(false)
@@ -99 +99 @@
                                        const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
-                 m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
-
-    if (   m_enmMode != DNDMODE_UNKNOWN
-        && m_enmMode != DNDMODE_HOSTTOGUEST)
+    LogFlowFunc(("enmOpMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
+                 m_enmOpMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
+
+    if (   m_enmOpMode != DNDMODE_UNKNOWN
+        && m_enmOpMode != DNDMODE_HOSTTOGUEST)
         return Qt::IgnoreAction;
 
@@ -114 +114 @@
                                           pMimeData->formats().toVector());
     if (m_dndTarget.isOk())
-        setMode(DNDMODE_HOSTTOGUEST);
-
-    /* Set the DnD action returned by the guest. */
-    return toQtDnDAction(result);
+    {
+        setOpMode(DNDMODE_HOSTTOGUEST);
+        return toQtDnDAction(result);
+    }
+
+    msgCenter().cannotDropDataToGuest(m_dndTarget, m_pParent);
+    return Qt::IgnoreAction;
 }
 
@@ -124 +127 @@
                                       const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
-                 m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
-
-    if (m_enmMode != DNDMODE_HOSTTOGUEST)
+    LogFlowFunc(("enmOpMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
+                 m_enmOpMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
+
+    if (m_enmOpMode != DNDMODE_HOSTTOGUEST)
         return Qt::IgnoreAction;
 
@@ -138 +141 @@
                                          toVBoxDnDActions(possibleActions),
                                          pMimeData->formats().toVector());
-    /* Set the DnD action returned by the guest. */
-    return toQtDnDAction(result);
+    if (m_dndTarget.isOk())
+        return toQtDnDAction(result);
+
+    msgCenter().cannotDropDataToGuest(m_dndTarget, m_pParent);
+    return Qt::IgnoreAction;
 }
 
@@ -146 +152 @@
                                       const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
-                 m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
-
-    if (m_enmMode != DNDMODE_HOSTTOGUEST)
+    LogFlowFunc(("enmOpMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
+                 m_enmOpMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
+
+    if (m_enmOpMode != DNDMODE_HOSTTOGUEST)
         return Qt::IgnoreAction;
 
@@ -258 +264 @@
      * mode as well here.
      */
-    setMode(DNDMODE_UNKNOWN);
+    setOpMode(DNDMODE_UNKNOWN);
 
     return toQtDnDAction(enmResult);
@@ -265 +271 @@
 void UIDnDHandler::dragLeave(ulong screenID)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32\n", m_enmMode, screenID));
-
-    if (m_enmMode == DNDMODE_HOSTTOGUEST)
+    LogFlowFunc(("enmOpMode=%RU32, screenID=%RU32\n", m_enmOpMode, screenID));
+
+    if (m_enmOpMode == DNDMODE_HOSTTOGUEST)
     {
         m_dndTarget.Leave(screenID);
-        setMode(DNDMODE_UNKNOWN);
+        setOpMode(DNDMODE_UNKNOWN);
     }
 }
@@ -448 +454 @@
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
 
-    LogFlowFunc(("enmMode=%RU32, fIsPending=%RTbool, screenID=%RU32\n", m_enmMode, m_fIsPending, screenID));
+    LogFlowFunc(("enmOpMode=%RU32, fIsPending=%RTbool, screenID=%RU32\n", m_enmOpMode, m_fIsPending, screenID));
 
     {
         QMutexLocker AutoReadLock(&m_ReadLock);
 
-        if (   m_enmMode != DNDMODE_UNKNOWN
-            && m_enmMode != DNDMODE_GUESTTOHOST) /* Wrong mode set? */
+        if (   m_enmOpMode != DNDMODE_UNKNOWN
+            && m_enmOpMode != DNDMODE_GUESTTOHOST) /* Wrong mode set? */
             return VINF_SUCCESS;
 
@@ -548 +554 @@
     }
 
-    setMode(DNDMODE_GUESTTOHOST);
+    setOpMode(DNDMODE_GUESTTOHOST);
 
     rc = dragStartInternal(m_dataSource.lstFormats,
@@ -594 +600 @@
     m_fIsPending = false;
 
-    setMode(DNDMODE_UNKNOWN);
+    setOpMode(DNDMODE_UNKNOWN);
 }
 
@@ -684 +690 @@
                 /* After we successfully retrieved data from the source we query it from Main. */
                 vecData = m_dndSource.ReceiveData(); /** @todo QVector.size() is "int" only!? */
-                if (vecData.isEmpty())
-                    rc = VERR_NO_DATA;
+                if (m_dndSource.isOk())
+                {
+                    if (vecData.isEmpty())
+                        rc = VERR_NO_DATA;
+                }
+                else
+                {
+                    msgCenter().cannotDropDataToHost(m_dndSource, m_pParent);
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+                }
             }
             else
@@ -699 +713 @@
     }
 
-    setMode(DNDMODE_UNKNOWN);
+    setOpMode(DNDMODE_UNKNOWN);
 
     LogFlowFuncLeaveRC(rc);
@@ -705 +719 @@
 }
 
-void UIDnDHandler::setMode(DNDMODE enmMode)
+void UIDnDHandler::setOpMode(DNDOPMODE enmMode)
 {
     QMutexLocker AutoWriteLock(&m_WriteLock);
-    m_enmMode = enmMode;
-    LogFlowFunc(("Mode is now: %RU32\n", m_enmMode));
+    m_enmOpMode = enmMode;
+    LogFunc(("Operation mode is now: %RU32\n", m_enmOpMode));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h

@@ -49 +49 @@
      *       drag and drop mode.
      */
-    typedef enum DNDMODE
+    typedef enum DNDOPMODE
     {
         /** Unknown mode. */
@@ -60 +60 @@
         /** The usual 32-bit type blow up. */
         DNDMODE_32BIT_HACK = 0x7fffffff
-    } DNDMODE;
+    } DNDOPMODE;
 
     /**
@@ -125 +125 @@
     int                        dragStartInternal(const QStringList &lstFormats, Qt::DropAction defAction, Qt::DropActions actions);
     int                        retrieveDataInternal(Qt::DropAction dropAction, const QString &strMIMEType, QVector<uint8_t> &vecData);
-    void                       setMode(DNDMODE enmMode);
+    void                       setOpMode(DNDOPMODE enmMode);
 
 protected:
@@ -133 +133 @@
     /** Pointer to parent widget. */
     QWidget          *m_pParent;
-
     /** Drag and drop source instance. */
     CDnDSource        m_dndSource;
     /** Drag and drop target instance. */
     CDnDTarget        m_dndTarget;
-    /** Current transfer direction. */
-    DNDMODE           m_enmMode;
+    /** Current operation mode, indicating the transfer direction.
+     *  Note: This is independent of the current drag and drop
+     *        mode being set for this VM! */
+    DNDOPMODE         m_enmOpMode;
     /** Current data from the source (if any).
      *  At the momenet we only support one source at a time. */