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

Timestamp:

May 30, 2014 2:58:02 PM (11 years ago)

Author:

vboxsync

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

94064

Message:

DnD: API overhaul; now using IDnDTarget + IDnDSource. Renamed DragAndDrop* enumerations to DnD*. Also rewrote some internal code.

Location:

trunk/src/VBox

Files:

• . (modified) (1 prop)
• Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (4 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/UIVMInfoDialog.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/converter/UIConverterBackend.h (modified) (3 diffs)
• Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.h (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDrag.cpp (modified) (7 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDrag.h (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (modified) (14 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDHandler.h (modified) (4 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp (modified) (6 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h (modified) (4 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (5 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (11 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineView.h (modified) (2 diffs)
• Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp (modified) (7 diffs)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -198 +198 @@
             }
 
-            DragAndDropMode_T mode;
+            DnDMode_T mode;
             if (!strcmp(a->argv[2], "disabled"))
-                mode = DragAndDropMode_Disabled;
+                mode = DnDMode_Disabled;
             else if (!strcmp(a->argv[2], "hosttoguest"))
-                mode = DragAndDropMode_HostToGuest;
+                mode = DnDMode_HostToGuest;
             else if (!strcmp(a->argv[2], "guesttohost"))
-                mode = DragAndDropMode_GuestToHost;
+                mode = DnDMode_GuestToHost;
             else if (!strcmp(a->argv[2], "bidirectional"))
-                mode = DragAndDropMode_Bidirectional;
+                mode = DnDMode_Bidirectional;
             else
             {
@@ -214 +214 @@
             if (SUCCEEDED(rc))
             {
-                CHECK_ERROR_BREAK(sessionMachine, COMSETTER(DragAndDropMode)(mode));
+                CHECK_ERROR_BREAK(sessionMachine, COMSETTER(DnDMode)(mode));
             }
         }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1610 +1610 @@
     {
         const char *psz = "Unknown";
-        DragAndDropMode_T enmMode;
-        rc = machine->COMGETTER(DragAndDropMode)(&enmMode);
+        DnDMode_T enmMode;
+        rc = machine->COMGETTER(DnDMode)(&enmMode);
         switch (enmMode)
         {
-            case DragAndDropMode_Disabled:
+            case DnDMode_Disabled:
                 if (details == VMINFO_MACHINEREADABLE)
                     psz = "disabled";
@@ -1620 +1620 @@
                     psz = "disabled";
                 break;
-            case DragAndDropMode_HostToGuest:
+            case DnDMode_HostToGuest:
                 if (details == VMINFO_MACHINEREADABLE)
                     psz = "hosttoguest";
@@ -1626 +1626 @@
                     psz = "HostToGuest";
                 break;
-            case DragAndDropMode_GuestToHost:
+            case DnDMode_GuestToHost:
                 if (details == VMINFO_MACHINEREADABLE)
                     psz = "guesttohost";
@@ -1632 +1632 @@
                     psz = "GuestToHost";
                 break;
-            case DragAndDropMode_Bidirectional:
+            case DnDMode_Bidirectional:
                 if (details == VMINFO_MACHINEREADABLE)
                     psz = "bidirectional";

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -2168 +2168 @@
             case MODIFYVM_DRAGANDDROP:
             {
-                DragAndDropMode_T mode;
+                DnDMode_T mode;
                 if (!RTStrICmp(ValueUnion.psz, "disabled"))
-                    mode = DragAndDropMode_Disabled;
+                    mode = DnDMode_Disabled;
                 else if (!RTStrICmp(ValueUnion.psz, "hosttoguest"))
-                    mode = DragAndDropMode_HostToGuest;
+                    mode = DnDMode_HostToGuest;
                 else if (!RTStrICmp(ValueUnion.psz, "guesttohost"))
-                    mode = DragAndDropMode_GuestToHost;
+                    mode = DnDMode_GuestToHost;
                 else if (!RTStrICmp(ValueUnion.psz, "bidirectional"))
-                    mode = DragAndDropMode_Bidirectional;
+                    mode = DnDMode_Bidirectional;
                 else
                 {
@@ -2184 +2184 @@
                 if (SUCCEEDED(rc))
                 {
-                    CHECK_ERROR(machine, COMSETTER(DragAndDropMode)(mode));
+                    CHECK_ERROR(machine, COMSETTER(DnDMode)(mode));
                 }
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -606 +606 @@
         QString strClipboardMode = gpConverter->toString(m.GetClipboardMode());
         /* Determine Drag&Drop mode: */
-        QString strDragAndDropMode = gpConverter->toString(m.GetDragAndDropMode());
+        QString strDnDMode = gpConverter->toString(m.GetDnDMode());
 
         /* Deterine virtualization attributes: */
@@ -658 +658 @@
         strResult += formatValue(tr("VM Uptime"), strUptime, iMaxLength);
         strResult += formatValue(tr("Clipboard Mode"), strClipboardMode, iMaxLength);
-        strResult += formatValue(tr("Drag'n'Drop Mode"), strDragAndDropMode, iMaxLength);
+        strResult += formatValue(tr("Drag'n'Drop Mode"), strDnDMode, iMaxLength);
         strResult += formatValue(VBoxGlobal::tr("VT-x/AMD-V", "details report"), strVirtualization, iMaxLength);
         strResult += formatValue(VBoxGlobal::tr("Nested Paging", "details report"), strNestedPaging, iMaxLength);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -88 +88 @@
 template<> bool canConvert<KDeviceType>();
 template<> bool canConvert<KClipboardMode>();
-template<> bool canConvert<KDragAndDropMode>();
+template<> bool canConvert<KDnDMode>();
 template<> bool canConvert<KPointingHIDType>();
 template<> bool canConvert<KMediumType>();
@@ -161 +161 @@
 template<> QString toString(const KDeviceType &type);
 template<> QString toString(const KClipboardMode &mode);
-template<> QString toString(const KDragAndDropMode &mode);
+template<> QString toString(const KDnDMode &mode);
 template<> QString toString(const KPointingHIDType &type);
 template<> QString toString(const KMediumType &type);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -34 +34 @@
 template<> bool canConvert<KDeviceType>() { return true; }
 template<> bool canConvert<KClipboardMode>() { return true; }
-template<> bool canConvert<KDragAndDropMode>() { return true; }
+template<> bool canConvert<KDnDMode>() { return true; }
 template<> bool canConvert<KPointingHIDType>() { return true; }
 template<> bool canConvert<KMediumType>() { return true; }
@@ -202 +202 @@
 }
 
-/* QString <= KDragAndDropMode: */
-template<> QString toString(const KDragAndDropMode &mode)
+/* QString <= KDnDMode: */
+template<> QString toString(const KDnDMode &mode)
 {
     switch (mode)
     {
-        case KDragAndDropMode_Disabled:      return QApplication::translate("VBoxGlobal", "Disabled", "DragAndDropType");
-        case KDragAndDropMode_HostToGuest:   return QApplication::translate("VBoxGlobal", "Host To Guest", "DragAndDropType");
-        case KDragAndDropMode_GuestToHost:   return QApplication::translate("VBoxGlobal", "Guest To Host", "DragAndDropType");
-        case KDragAndDropMode_Bidirectional: return QApplication::translate("VBoxGlobal", "Bidirectional", "DragAndDropType");
+        case KDnDMode_Disabled:      return QApplication::translate("VBoxGlobal", "Disabled", "DragAndDropType");
+        case KDnDMode_HostToGuest:   return QApplication::translate("VBoxGlobal", "Host To Guest", "DragAndDropType");
+        case KDnDMode_GuestToHost:   return QApplication::translate("VBoxGlobal", "Guest To Host", "DragAndDropType");
+        case KDnDMode_Bidirectional: return QApplication::translate("VBoxGlobal", "Bidirectional", "DragAndDropType");
         default: AssertMsgFailed(("No text for %d", mode)); break;
     }

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

@@ -41 +41 @@
 
 UIDnDDataObject::UIDnDDataObject(CSession &session,
+                                 CDnDSource &dndSource,
                                  const QStringList &lstFormats,
                                  QWidget *pParent)
     : mSession(session),
+      mDnDSource(dndSource),
       mpParent(pParent),
       mStatus(Uninitialized),
@@ -65 +67 @@
         RT_BZERO(mpStgMedium, sizeof(STGMEDIUM) * cMaxFormats);
 
-        for (int i = 0; i < lstFormats.size(); i++)
+        for (int i = 0;
+             (   i < lstFormats.size()
+              && i < cMaxFormats); i++)
         {
             const QString &strFormat = lstFormats.at(i);
@@ -95 +99 @@
         }
 
-        LogFlowFunc(("Total registered formats: %RU32 (of %d total)\n",
+        LogFlowFunc(("Total registered native formats: %RU32 (for %d formats from guest)\n",
                      cRegisteredFormats, lstFormats.size()));
         hr = S_OK;
@@ -290 +294 @@
         {
             rc = UIDnDDrag::RetrieveData(mSession,
+                                         mDnDSource,
+                                         /** @todo Support other actions. */
                                          Qt::CopyAction,
                                          strMIMEType, vaType, mVaData,

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

@@ -29 +29 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CDndSource.h"
 #include "CSession.h"
 
@@ -49 +50 @@
 public:
 
-    UIDnDDataObject(CSession &session, const QStringList &lstFormats, QWidget *pParent);
+    UIDnDDataObject(CSession &session, CDnDSource &dndSource, const QStringList &lstFormats, QWidget *pParent);
     virtual ~UIDnDDataObject(void);
 
@@ -87 +88 @@
     QWidget    *mpParent;
     CSession    mSession;
+    CDnDSource  mDnDSource;
     Status      mStatus;
     LONG        mRefCount;

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

@@ -44 +44 @@
 #endif
 
-UIDnDDrag::UIDnDDrag(CSession &session, 
+UIDnDDrag::UIDnDDrag(CSession &session,
+                     CDnDSource &dndSource,
                      const QStringList &lstFormats,
                      Qt::DropAction defAction, Qt::DropActions actions,
                      QWidget *pParent /* = NULL */)
     : m_session(session)
+    , m_dndSource(dndSource)
     , m_lstFormats(lstFormats)
     , m_defAction(defAction)
@@ -72 +74 @@
 #ifdef RT_OS_WINDOWS
     UIDnDDropSource *pDropSource = new UIDnDDropSource(m_pParent);
-    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_session, m_lstFormats, m_pParent);
+    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_session, m_dndSource, m_lstFormats, m_pParent);
 
     DWORD dwOKEffects = DROPEFFECT_NONE;
@@ -86 +88 @@
 
     DWORD dwEffect;
+    LogFlowFunc(("dwOKEffects=0x%x\n", dwOKEffects));
     HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
                               dwOKEffects, &dwEffect);
-    LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
-                     hr, dwEffect));
+    LogFlowFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
+                 hr, dwEffect));
 
     if (pDropSource)
@@ -99 +102 @@
 
     /* pMData is transfered to the QDrag object, so no need for deletion. */
-    pMData = new UIDnDMimeData(m_session, 
+    pMData = new UIDnDMimeData(m_session, m_dndSource,
                                m_lstFormats, m_defAction, m_actions,
                                m_pParent);
@@ -129 +132 @@
 /* static */
 int UIDnDDrag::RetrieveData(const CSession &session,
+                            CDnDSource &dndSource,
                             Qt::DropAction dropAction,
                             const QString &strMimeType,
@@ -140 +144 @@
     CGuest guest = session.GetConsole().GetGuest();
 
-    /* Start getting the data from the guest. First inform the guest we
+    /* Start getting the data from the source. First inform the source we
      * want the data in the specified MIME type. */
-    CProgress progress = guest.DragGHDropped(strMimeType,
-                                             UIDnDHandler::toVBoxDnDAction(dropAction));
+    CProgress progress = dndSource.Drop(strMimeType,
+                                        UIDnDHandler::toVBoxDnDAction(dropAction));
     if (guest.isOk())
     {
@@ -157 +161 @@
             if (RT_SUCCESS(rc))
             {
-                /* After the data successfully arrived from the guest, we query it from Main. */
-                QVector<uint8_t> vecData = guest.DragGHGetData();
+                /* After we successfully retrieved data from
+                * the source, we query it from Main. */
+                QVector<uint8_t> vecData = dndSource.ReceiveData();
                 if (!vecData.isEmpty())
                 {

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

@@ -28 +28 @@
 #include "CSession.h"
 #include "CConsole.h"
+#include "CDnDSource.h"
 #include "CGuest.h"
 
@@ -45 +46 @@
 public:
 
-    UIDnDDrag(CSession &session, 
+    UIDnDDrag(CSession &session, CDnDSource &dndSource,
               const QStringList &lstFormats, Qt::DropAction defAction, Qt::DropActions actions,
               QWidget *pParent = NULL);
@@ -54 +55 @@
 public:
 
-    static int RetrieveData(const CSession &session, Qt::DropAction dropAction, const QString &strMimeType, QVariant::Type vaType, QVariant &vaData, QWidget *pParent);
+    static int RetrieveData(const CSession &session, CDnDSource &dndSource, Qt::DropAction dropAction, const QString &strMimeType, QVariant::Type vaType, QVariant &vaData, QWidget *pParent);
 
 private:
 
     CSession          m_session;
+    CDnDSource        m_dndSource;
     QStringList       m_lstFormats;
     Qt::DropAction    m_defAction;

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

@@ -34 +34 @@
 #include "UIDnDHandler.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
+# include "CDnDSource.h"
 # include "UIDnDDrag.h"
 #endif
@@ -39 +40 @@
 
 /* COM includes: */
+#include "CConsole.h"
+#include "CDnDTarget.h"
+#include "CGuest.h"
 #include "CSession.h"
-#include "CConsole.h"
-#include "CGuest.h"
+
+
 
 UIDnDHandler *UIDnDHandler::m_pInstance = NULL;
 
 UIDnDHandler::UIDnDHandler(void)
-    : mMode(Unknown)
 {
 }
 
 /*
- * Host -> Guest
- */
-
-Qt::DropAction UIDnDHandler::dragHGEnter(CGuest &guest, ulong screenId, int x, int y,
-                                         Qt::DropAction proposedAction, Qt::DropActions possibleActions,
-                                         const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
-{
-    if (mMode == GH) /* Wrong mode? Bail out. */
-        return Qt::IgnoreAction;
-
+ * Frontend -> Target.
+ */
+
+Qt::DropAction UIDnDHandler::dragEnter(CDnDTarget &dndTarget, ulong screenId, int x, int y,
+                                       Qt::DropAction proposedAction, Qt::DropActions possibleActions,
+                                       const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
+{
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
                  screenId, x, y, toVBoxDnDAction(proposedAction)));
 
     /* Ask the guest for starting a DnD event. */
-    KDragAndDropAction result = guest.DragHGEnter(screenId,
-                                                  x,
-                                                  y,
-                                                  toVBoxDnDAction(proposedAction),
-                                                  toVBoxDnDActions(possibleActions),
-                                                  pMimeData->formats().toVector());
+    KDnDAction result = dndTarget.Enter(screenId,
+                                        x,
+                                        y,
+                                        toVBoxDnDAction(proposedAction),
+                                        toVBoxDnDActions(possibleActions),
+                                        pMimeData->formats().toVector());
+
     /* Set the DnD action returned by the guest. */
     return toQtDnDAction(result);
 }
 
-Qt::DropAction UIDnDHandler::dragHGMove(CGuest &guest, ulong screenId, int x, int y,
-                                        Qt::DropAction proposedAction, Qt::DropActions possibleActions,
-                                        const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
-{
-    if (mMode == GH) /* Wrong mode? Bail out. */
-        return Qt::IgnoreAction;
-
+Qt::DropAction UIDnDHandler::dragMove(CDnDTarget &dndTarget, ulong screenId, int x, int y,
+                                      Qt::DropAction proposedAction, Qt::DropActions possibleActions,
+                                      const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
+{
 #ifdef DEBUG_andy
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
@@ -89 +87 @@
     /* Notify the guest that the mouse has been moved while doing
      * a drag'n drop operation. */
-    KDragAndDropAction result = guest.DragHGMove(screenId,
-                                                 x,
-                                                 y,
-                                                 toVBoxDnDAction(proposedAction),
-                                                 toVBoxDnDActions(possibleActions),
-                                                 pMimeData->formats().toVector());
+    KDnDAction result = dndTarget.Move(screenId,
+                                       x,
+                                       y,
+                                       toVBoxDnDAction(proposedAction),
+                                       toVBoxDnDActions(possibleActions),
+                                       pMimeData->formats().toVector());
     /* Set the DnD action returned by the guest. */
     return toQtDnDAction(result);
 }
 
-Qt::DropAction UIDnDHandler::dragHGDrop(CGuest &guest, ulong screenId, int x, int y,
-                                        Qt::DropAction proposedAction, Qt::DropActions possibleActions,
-                                        const QMimeData *pMimeData, QWidget *pParent /* = NULL */)
-{
-    if (mMode == GH) /* Wrong mode? Bail out. */
-        return Qt::IgnoreAction;
+Qt::DropAction UIDnDHandler::dragDrop(CSession &session, CDnDTarget &dndTarget,
+                                      ulong screenId, int x, int y,
+                                      Qt::DropAction proposedAction, Qt::DropActions possibleActions,
+                                      const QMimeData *pMimeData, QWidget *pParent /* = NULL */)
+{
+    CGuest guest = session.GetConsole().GetGuest();
 
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
@@ -112 +110 @@
     QString format;
     /* Ask the guest for dropping data. */
-    KDragAndDropAction result = guest.DragHGDrop(screenId,
-                                                 x,
-                                                 y,
-                                                 toVBoxDnDAction(proposedAction),
-                                                 toVBoxDnDActions(possibleActions),
-                                                 pMimeData->formats().toVector(), format);
+    KDnDAction result = dndTarget.Drop(screenId,
+                                       x,
+                                       y,
+                                       toVBoxDnDAction(proposedAction),
+                                       toVBoxDnDActions(possibleActions),
+                                       pMimeData->formats().toVector(), format);
     /* Has the guest accepted the drop event? */
-    if (result != KDragAndDropAction_Ignore)
+    if (result != KDnDAction_Ignore)
     {
         /* Get the actual MIME data in the requested format. */
+        AssertPtr(pMimeData);
         const QByteArray &d = pMimeData->data(format);
         if (   !d.isEmpty()
@@ -131 +130 @@
             memcpy(dv.data(), d.constData(), d.size());
 
-            CProgress progress = guest.DragHGPutData(screenId, format, dv);
+            CProgress progress = dndTarget.SendData(screenId, format, dv);
             if (guest.isOk())
             {
@@ -142 +141 @@
                 {
                     msgCenter().cannotDropData(progress, pParent);
-                    result = KDragAndDropAction_Ignore;
+                    result = KDnDAction_Ignore;
                 }
             }
@@ -148 +147 @@
             {
                 msgCenter().cannotDropData(guest, pParent);
-                result = KDragAndDropAction_Ignore;
+                result = KDnDAction_Ignore;
             }
         }
@@ -156 +155 @@
 }
 
-void UIDnDHandler::dragHGLeave(CGuest &guest, ulong screenId, QWidget * /* pParent = NULL */)
-{
-    if (mMode == GH) /* Wrong mode? Bail out. */
-        return;
-
+void UIDnDHandler::dragLeave(CDnDTarget &dndTarget,
+                             ulong screenId, QWidget * /* pParent = NULL */)
+{
     LogFlowFunc(("screenId=%RU32\n", screenId));
-    guest.DragHGLeave(screenId);
-}
-
-int UIDnDHandler::dragGHPending(CSession &session, ulong screenId, QWidget *pParent /* = NULL */)
+    dndTarget.Leave(screenId);
+}
+
+/*
+ * Source -> Frontend.
+ */
+
+int UIDnDHandler::dragIsPending(CSession &session, CDnDSource &dndSource,
+                                ulong screenId, QWidget *pParent /* = NULL */)
 {
     int rc;
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    if (mMode == HG) /* Wrong mode? Bail out. */
-        return VERR_WRONG_ORDER;
-
     /*
-     * How this works: Host is asking the guest if there is any DnD
-     * operation pending, when the mouse leaves the guest window
-     * (DragGHPending). On return there is some info about a running DnD
-     * operation (or defaultAction is KDragAndDropAction_Ignore if not). With
+     * How this works: Source is asking the target if there is any DnD
+     * operation pending, when the mouse leaves the guest window. On
+     * return there is some info about a running DnD operation
+     * (or defaultAction is KDnDAction_Ignore if not). With
      * this information we create a Qt QDrag object with our own QMimeType
      * implementation and call exec. Please note, this *blocks* until the DnD
@@ -183 +182 @@
     CGuest guest = session.GetConsole().GetGuest();
     QVector<QString> vecFmtGuest;
-    QVector<KDragAndDropAction> vecActions;
-    KDragAndDropAction defaultAction = guest.DragGHPending(screenId, vecFmtGuest, vecActions);
+    QVector<KDnDAction> vecActions;
+    KDnDAction defaultAction = dndSource.DragIsPending(screenId, vecFmtGuest, vecActions);
     LogFlowFunc(("defaultAction=%d, numFormats=%d\n", defaultAction, vecFmtGuest.size()));
 
     QStringList lstFmtNative;
-    if (defaultAction != KDragAndDropAction_Ignore)
+    if (defaultAction != KDnDAction_Ignore)
     {
         /*
@@ -234 +233 @@
     if (!lstFmtNative.isEmpty())
     {
-        UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
-                                         toQtDnDAction(defaultAction),
-                                         toQtDnDActions(vecActions), pParent);
-        rc = pDrag->DoDragDrop();
-
-        delete pDrag;
+        try
+        {
+            UIDnDDrag *pDrag = new UIDnDDrag(session, dndSource, lstFmtNative,
+                                             toQtDnDAction(defaultAction),
+                                             toQtDnDActions(vecActions), pParent);
+            rc = pDrag->DoDragDrop();
+
+            delete pDrag;
+        }
+        catch (std::bad_alloc &)
+        {
+            rc = VERR_NO_MEMORY;
+        }
     }
-    else
-        rc = VINF_SUCCESS;
+    else /* No format data from the guest arrived yet. */
+        rc = VERR_NO_DATA;
 #else /* !VBOX_WITH_DRAG_AND_DROP_GH */
     NOREF(session);
@@ -260 +266 @@
 
 /* static */
-KDragAndDropAction UIDnDHandler::toVBoxDnDAction(Qt::DropAction action)
+KDnDAction UIDnDHandler::toVBoxDnDAction(Qt::DropAction action)
 {
     if (action == Qt::CopyAction)
-        return KDragAndDropAction_Copy;
+        return KDnDAction_Copy;
     if (action == Qt::MoveAction)
-        return KDragAndDropAction_Move;
+        return KDnDAction_Move;
     if (action == Qt::LinkAction)
-        return KDragAndDropAction_Link;
-
-    return KDragAndDropAction_Ignore;
+        return KDnDAction_Link;
+
+    return KDnDAction_Ignore;
 }
 
 /* static */
-QVector<KDragAndDropAction> UIDnDHandler::toVBoxDnDActions(Qt::DropActions actions)
-{
-    QVector<KDragAndDropAction> vbActions;
+QVector<KDnDAction> UIDnDHandler::toVBoxDnDActions(Qt::DropActions actions)
+{
+    QVector<KDnDAction> vbActions;
     if (actions.testFlag(Qt::IgnoreAction))
-        vbActions << KDragAndDropAction_Ignore;
+        vbActions << KDnDAction_Ignore;
     if (actions.testFlag(Qt::CopyAction))
-        vbActions << KDragAndDropAction_Copy;
+        vbActions << KDnDAction_Copy;
     if (actions.testFlag(Qt::MoveAction))
-        vbActions << KDragAndDropAction_Move;
+        vbActions << KDnDAction_Move;
     if (actions.testFlag(Qt::LinkAction))
-        vbActions << KDragAndDropAction_Link;
+        vbActions << KDnDAction_Link;
 
     return vbActions;
@@ -289 +295 @@
 
 /* static */
-Qt::DropAction UIDnDHandler::toQtDnDAction(KDragAndDropAction action)
+Qt::DropAction UIDnDHandler::toQtDnDAction(KDnDAction action)
 {
     Qt::DropAction dropAct = Qt::IgnoreAction;
-    if (action == KDragAndDropAction_Copy)
+    if (action == KDnDAction_Copy)
         dropAct = Qt::CopyAction;
-    if (action == KDragAndDropAction_Move)
+    if (action == KDnDAction_Move)
         dropAct = Qt::MoveAction;
-    if (action == KDragAndDropAction_Link)
+    if (action == KDnDAction_Link)
         dropAct = Qt::LinkAction;
 
@@ -304 +310 @@
 
 /* static */
-Qt::DropActions UIDnDHandler::toQtDnDActions(const QVector<KDragAndDropAction> &vecActions)
+Qt::DropActions UIDnDHandler::toQtDnDActions(const QVector<KDnDAction> &vecActions)
 {
     Qt::DropActions dropActs = Qt::IgnoreAction;
@@ -311 +317 @@
         switch (vecActions.at(i))
         {
-            case KDragAndDropAction_Ignore:
+            case KDnDAction_Ignore:
                 dropActs |= Qt::IgnoreAction;
                 break;
-            case KDragAndDropAction_Copy:
+            case KDnDAction_Copy:
                 dropActs |= Qt::CopyAction;
                 break;
-            case KDragAndDropAction_Move:
+            case KDnDAction_Move:
                 dropActs |= Qt::MoveAction;
                 break;
-            case KDragAndDropAction_Link:
+            case KDnDAction_Link:
                 dropActs |= Qt::LinkAction;
                 break;

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * UIDnDHandler class declaration
+ * UIDnDHandler class declaration.
  */
 
@@ -26 +26 @@
 /* Forward declarations: */
 class QMimeData;
+class CDnDSource;
+class CDnDTarget;
+class CGuest;
 class CSession;
-class CGuest;
 class UIDnDMimeData;
 
@@ -37 +39 @@
 
     /* Singleton factory. */
-    static UIDnDHandler* instance(void)
+    static UIDnDHandler *instance(void)
     {
         if (!m_pInstance)
@@ -56 +58 @@
      * Current operation mode.
      */
-    enum Mode
+    enum Direction
     {
         /** Unknown mode. */
         Unknown = 0,
         /** Host to guest. */
-        HG,
+        HostToGuest,
         /** Guest to host. */
-        GH
+        GuestToHost
+        /** @todo Implement guest to guest. */
     };
 
-    /* Host -> Guest. */
-    Qt::DropAction dragHGEnter(CGuest &guest, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
-    Qt::DropAction dragHGMove (CGuest &guest, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
-    Qt::DropAction dragHGDrop (CGuest &guest, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
-    void           dragHGLeave(CGuest &guest, ulong screenId, QWidget *pParent = NULL);
+    /* Frontend -> Target. */
+    Qt::DropAction             dragEnter(CDnDTarget &dndTarget, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
+    Qt::DropAction             dragMove (CDnDTarget &dndTarget, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
+    Qt::DropAction             dragDrop (CSession &session, CDnDTarget &dndTarget, ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData, QWidget *pParent = NULL);
+    void                       dragLeave(CDnDTarget &dndTarget, ulong screenId, QWidget *pParent = NULL);
 
-    /* Guest -> Host. */
-    int            dragGHPending(CSession &session, ulong screenId, QWidget *pParent = NULL);
+    /* Source -> Frontend. */
+    int                        dragIsPending(CSession &session, CDnDSource &dndSource, ulong screenId, QWidget *pParent = NULL);
 
 public:
 
-    static KDragAndDropAction          toVBoxDnDAction(Qt::DropAction action);
-    static QVector<KDragAndDropAction> toVBoxDnDActions(Qt::DropActions actions);
-    static Qt::DropAction              toQtDnDAction(KDragAndDropAction action);
-    static Qt::DropActions             toQtDnDActions(const QVector<KDragAndDropAction> &vecActions);
+    static KDnDAction          toVBoxDnDAction(Qt::DropAction action);
+    static QVector<KDnDAction> toVBoxDnDActions(Qt::DropActions actions);
+    static Qt::DropAction      toQtDnDAction(KDnDAction action);
+    static Qt::DropActions     toQtDnDActions(const QVector<KDnDAction> &vecActions);
 
 private:
-    static UIDnDHandler *m_pInstance;
 
     UIDnDHandler(void);
     virtual ~UIDnDHandler(void) {}
 
-    /** The current operation mode. */
-    Mode mMode;
+private:
+
+    /** Static pointer to singleton instance. */
+    static UIDnDHandler *m_pInstance;
 };
 
-#define gDnD UIDnDHandler::instance()
+/** Gets the singleton instance of the drag'n drop UI helper class. */
+#define DnDHandler() UIDnDHandler::instance()
 
 #endif /* ___UIDnDHandler_h___ */

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

@@ -38 +38 @@
 #include "UIMessageCenter.h"
 
-UIDnDMimeData::UIDnDMimeData(CSession &session, 
+UIDnDMimeData::UIDnDMimeData(CSession &session,
+                             CDnDSource &dndSource,
                              QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
                              QWidget *pParent)
     : m_Session(session)
+    , m_DnDSource(dndSource)
     , m_lstFormats(formats)
     , m_defAction(defAction)
@@ -109 +111 @@
 
 QVariant UIDnDMimeData::retrieveData(const QString &strMIMEType,
-                                     QVariant::Type vaType) const
+                                     QVariant::Type vaType)
 {
     LogFlowFunc(("m_enmState=%d, mimeType=%s, type=%d (%s)\n",
@@ -165 +167 @@
     {
         rc = UIDnDDrag::RetrieveData(m_Session,
+                                     m_DnDSource,
                                      m_defAction,
                                      strMIMEType, vaType, m_vaData,
@@ -198 +201 @@
                 LogFlowFunc(("MouseMove: x=%d, y=%d\n",
                              pMouseEvent->globalX(), pMouseEvent->globalY()));
-                
+
                 return true;
                 /* Never reached. */
@@ -207 +210 @@
                 LogFlowFunc(("MouseButtonRelease\n"));
                 m_enmState = Dropped;
-                
+
                 return true;
                 /* Never reached. */
@@ -220 +223 @@
                     m_enmState = Canceled;
                 }
-                
+
                 return true;
                 /* Never reached. */

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

@@ -26 +26 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CConsole.h"
+#include "CDnDSource.h"
+#include "CGuest.h"
 #include "CSession.h"
-#include "CConsole.h"
-#include "CGuest.h"
 
 #include "UIDnDHandler.h"
@@ -61 +62 @@
 public:
 
-    UIDnDMimeData(CSession &session, QStringList formats, Qt::DropAction defAction, Qt::DropActions actions, QWidget *pParent);
+    UIDnDMimeData(CSession &session, CDnDSource &dndSource, QStringList formats, Qt::DropAction defAction, Qt::DropActions actions, QWidget *pParent);
 
 public:
@@ -78 +79 @@
     virtual bool hasFormat(const QString &mimeType) const;
 
-    virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+    virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type);
 
 #ifndef RT_OS_WINDOWS
@@ -98 +99 @@
 
     CSession          m_Session;
+    CDnDSource        m_DnDSource;
     QStringList       m_lstFormats;
     Qt::DropAction    m_defAction;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -729 +729 @@
     {
         foreach (QAction *pAction, m_pDragAndDropActions->actions())
-            pAction->setText(gpConverter->toString(pAction->data().value<KDragAndDropMode>()));
+            pAction->setText(gpConverter->toString(pAction->data().value<KDnDMode>()));
     }
 }
@@ -1864 +1864 @@
     {
         m_pDragAndDropActions = new QActionGroup(this);
-        for (int i = KDragAndDropMode_Disabled; i < KDragAndDropMode_Max; ++i)
+        for (int i = KDnDMode_Disabled; i < KDnDMode_Max; ++i)
         {
-            KDragAndDropMode mode = (KDragAndDropMode)i;
+            KDnDMode mode = (KDnDMode)i;
             QAction *pAction = new QAction(gpConverter->toString(mode), m_pDragAndDropActions);
             pMenu->addAction(pAction);
             pAction->setData(QVariant::fromValue(mode));
             pAction->setCheckable(true);
-            pAction->setChecked(session().GetMachine().GetDragAndDropMode() == mode);
+            pAction->setChecked(session().GetMachine().GetDnDMode() == mode);
         }
         connect(m_pDragAndDropActions, SIGNAL(triggered(QAction*)),
@@ -1879 +1879 @@
     else
         foreach (QAction *pAction, m_pDragAndDropActions->actions())
-            if (pAction->data().value<KDragAndDropMode>() == session().GetMachine().GetDragAndDropMode())
+            if (pAction->data().value<KDnDMode>() == session().GetMachine().GetDnDMode())
                 pAction->setChecked(true);
 }
@@ -1961 +1961 @@
 {
     /* Assign new mode (without save): */
-    KDragAndDropMode mode = pAction->data().value<KDragAndDropMode>();
-    session().GetMachine().SetDragAndDropMode(mode);
+    KDnDMode mode = pAction->data().value<KDnDMode>();
+    session().GetMachine().SetDnDMode(mode);
 }
 

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

@@ -61 +61 @@
 #include "CFramebuffer.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
+# include "CDnDSource.h"
+# include "CDnDTarget.h"
 # include "CGuest.h"
+# include "CGuestDnDTarget.h"
+# include "CGuestDnDSource.h"
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 
@@ -1160 +1164 @@
 void UIMachineView::dragEnterEvent(QDragEnterEvent *pEvent)
 {
-    /* The guest object to talk to. */
+    AssertPtrReturnVoid(pEvent);
+
+    /* Get mouse-pointer location. */
+    const QPoint &cpnt = viewportToContents(pEvent->pos());
+
     CGuest guest = session().GetConsole().GetGuest();
-
-    /* Get mouse-pointer location */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
-
-    /* Ask the guest for starting a DnD event. */
-    Qt::DropAction result = gDnD->dragHGEnter(guest,
-                                              screenId(),
-                                              frameBuffer()->convertHostXTo(cpnt.x()),
-                                              frameBuffer()->convertHostYTo(cpnt.y()),
-                                              pEvent->proposedAction(),
-                                              pEvent->possibleActions(),
-                                              pEvent->mimeData(), this);
+    CGuestDnDTarget dndTarget = guest.GetDnDTarget();
+
+    /* Ask the target for starting a DnD event. */
+    Qt::DropAction result = DnDHandler()->dragEnter(static_cast<CDnDTarget>(dndTarget),
+                                                    screenId(),
+                                                    frameBuffer()->convertHostXTo(cpnt.x()),
+                                                    frameBuffer()->convertHostYTo(cpnt.y()),
+                                                    pEvent->proposedAction(),
+                                                    pEvent->possibleActions(),
+                                                    pEvent->mimeData(), this /* pParent */);
 
     /* Set the DnD action returned by the guest. */
@@ -1182 +1188 @@
 void UIMachineView::dragMoveEvent(QDragMoveEvent *pEvent)
 {
-    /* The guest object to talk to. */
+    AssertPtrReturnVoid(pEvent);
+
+    /* Get mouse-pointer location. */
+    const QPoint &cpnt = viewportToContents(pEvent->pos());
+
     CGuest guest = session().GetConsole().GetGuest();
-
-    /* Get mouse-pointer location */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
+    CGuestDnDTarget dndTarget = guest.GetDnDTarget();
 
     /* Ask the guest for moving the drop cursor. */
-    Qt::DropAction result = gDnD->dragHGMove(guest,
-                                             screenId(),
-                                             frameBuffer()->convertHostXTo(cpnt.x()),
-                                             frameBuffer()->convertHostYTo(cpnt.y()),
-                                             pEvent->proposedAction(),
-                                             pEvent->possibleActions(),
-                                             pEvent->mimeData(), this);
+    Qt::DropAction result = DnDHandler()->dragMove(static_cast<CDnDTarget>(dndTarget),
+                                                   screenId(),
+                                                   frameBuffer()->convertHostXTo(cpnt.x()),
+                                                   frameBuffer()->convertHostYTo(cpnt.y()),
+                                                   pEvent->proposedAction(),
+                                                   pEvent->possibleActions(),
+                                                   pEvent->mimeData(), this /* pParent */);
 
     /* Set the DnD action returned by the guest. */
@@ -1204 +1212 @@
 void UIMachineView::dragLeaveEvent(QDragLeaveEvent *pEvent)
 {
-    /* The guest object to talk to. */
+    AssertPtrReturnVoid(pEvent);
+
     CGuest guest = session().GetConsole().GetGuest();
+    CGuestDnDTarget dndTarget = guest.GetDnDTarget();
 
     /* Ask the guest for stopping this DnD event. */
-    gDnD->dragHGLeave(guest, screenId(), this);
+    DnDHandler()->dragLeave(static_cast<CDnDTarget>(dndTarget),
+                            screenId(), this /* pParent */);
     pEvent->accept();
 }
 
+void UIMachineView::dragIsPending(void)
+{
+    /* At the moment we only support guest->host DnD. */
+    /** @todo Add guest->guest DnD functionality here by getting
+     *        the source of guest B (when copying from B to A). */
+    CGuest guest = session().GetConsole().GetGuest();
+    CDnDSource &dndSource = static_cast<CDnDSource>(guest.GetDnDSource());
+
+    /* Check for a pending DnD event within the guest and if so, handle all the
+     * magic. */
+    DnDHandler()->dragIsPending(session(), dndSource, screenId(), this /* pParent */);
+}
+
 void UIMachineView::dropEvent(QDropEvent *pEvent)
 {
-    /* The guest object to talk to. */
+    AssertPtrReturnVoid(pEvent);
+
+    /* Get mouse-pointer location. */
+    const QPoint &cpnt = viewportToContents(pEvent->pos());
+
     CGuest guest = session().GetConsole().GetGuest();
-
-    /* Get mouse-pointer location */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
+    CGuestDnDTarget dndTarget = guest.GetDnDTarget();
 
     /* Ask the guest for dropping data. */
-    Qt::DropAction result = gDnD->dragHGDrop(guest,
-                                             screenId(),
-                                             frameBuffer()->convertHostXTo(cpnt.x()),
-                                             frameBuffer()->convertHostYTo(cpnt.y()),
-                                             pEvent->proposedAction(),
-                                             pEvent->possibleActions(),
-                                             pEvent->mimeData(), this);
+    Qt::DropAction result = DnDHandler()->dragDrop(session(),
+                                                   static_cast<CDnDTarget>(dndTarget),
+                                                   screenId(),
+                                                   frameBuffer()->convertHostXTo(cpnt.x()),
+                                                   frameBuffer()->convertHostYTo(cpnt.y()),
+                                                   pEvent->proposedAction(),
+                                                   pEvent->possibleActions(),
+                                                   pEvent->mimeData(), this /* pParent */);
 
     /* Set the DnD action returned by the guest. */
@@ -1233 +1260 @@
     pEvent->accept();
 }
-
-void UIMachineView::handleGHDnd(void)
-{
-    /* The guest object to talk to. */
-    CGuest guest = session().GetConsole().GetGuest();
-
-    /* Check for a pending DnD event within the guest and if so, handle all the
-     * magic. */
-    gDnD->dragGHPending(session(), screenId(), this);
-}
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 
@@ -1249 +1266 @@
 bool UIMachineView::winEvent(MSG *pMsg, long* /* piResult */)
 {
-    /* Check if some system event should be filtered-out.
-     * Returning 'true' means filtering-out,
-     * Returning 'false' means passing event to Qt. */
-    bool fResult = false; /* Pass to Qt by default: */
+    AssertPtrReturn(pMsg, false);
+
+    /* Check if some system event should be filtered out.
+     * Returning @c true means filtering-out,
+     * Returning @c false means passing event to Qt. */
+    bool fResult = false; /* Pass to Qt by default. */
     switch (pMsg->message)
     {
@@ -1260 +1279 @@
         case WM_SYSKEYUP:
         {
-            /* Filter using keyboard-filter: */
-            bool fKeyboardFilteringResult = machineLogic()->keyboardHandler()->winEventFilter(pMsg, screenId());
-            /* Keyboard filter rules the result: */
+            /* Filter using keyboard filter? */
+            bool fKeyboardFilteringResult =
+                machineLogic()->keyboardHandler()->winEventFilter(pMsg, screenId());
+            /* Keyboard filter rules the result? */
             fResult = fKeyboardFilteringResult;
             break;
@@ -1269 +1289 @@
             break;
     }
-    /* Return result: */
+
     return fResult;
 }
@@ -1277 +1297 @@
 bool UIMachineView::x11Event(XEvent *pEvent)
 {
-    /* Check if some system event should be filtered-out.
-     * Returning 'true' means filtering-out,
-     * Returning 'false' means passing event to Qt. */
-    bool fResult = false; /* Pass to Qt by default: */
+    AssertPtrReturn(pEvent, false);
+
+    /* Check if some system event should be filtered out.
+     * Returning @c true means filtering-out,
+     * Returning @c false means passing event to Qt. */
+    bool fResult = false; /* Pass to Qt by default. */
     switch (pEvent->type)
     {
@@ -1288 +1310 @@
         case XKeyRelease:
         {
-            /* Filter using keyboard-filter: */
-            bool fKeyboardFilteringResult = machineLogic()->keyboardHandler()->x11EventFilter(pEvent, screenId());
-            /* Filter using mouse-filter: */
-            bool fMouseFilteringResult = machineLogic()->mouseHandler()->x11EventFilter(pEvent, screenId());
-            /* If at least one of filters wants to filter event out then the result is 'true': */
+            /* Filter using keyboard-filter? */
+            bool fKeyboardFilteringResult =
+                machineLogic()->keyboardHandler()->x11EventFilter(pEvent, screenId());
+            /* Filter using mouse-filter? */
+            bool fMouseFilteringResult =
+                machineLogic()->mouseHandler()->x11EventFilter(pEvent, screenId());
+            /* If at least one of filters wants to filter event out then the result is true. */
             fResult = fKeyboardFilteringResult || fMouseFilteringResult;
             break;
@@ -1299 +1323 @@
             break;
     }
-    /* Return result: */
+
     return fResult;
 }
 
-#endif
-
+#endif /* Q_WS_X11 */
+

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

@@ -39 +39 @@
 class UIMachineWindow;
 class UIFrameBuffer;
+#ifdef VBOX_WITH_DRAG_AND_DROP
+ class CDnDTarget;
+#endif
 class CSession;
 
@@ -217 +220 @@
     void dragLeaveEvent(QDragLeaveEvent *pEvent);
     void dragMoveEvent(QDragMoveEvent *pEvent);
+    void dragIsPending(void);
     void dropEvent(QDropEvent *pEvent);
-
-    void handleGHDnd();
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -936 +936 @@
                 || cpnt.y() > iCh - 1)
             {
-                bool fHandledGHDnD
+                bool fHandleDnDPending
                     = RT_BOOL(mouseButtons.testFlag(Qt::LeftButton));
-                if (fHandledGHDnD)
-                {
-                    m_views[uScreenId]->handleGHDnd();
+                if (fHandleDnDPending)
+                {
+                    m_views[uScreenId]->dragIsPending();
                     return true;
                 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
 
     /* Drag'n'drop mode */
-    mCbDragAndDrop->addItem (""); /* KDragAndDropMode_Disabled */
-    mCbDragAndDrop->addItem (""); /* KDragAndDropMode_HostToGuest */
-    mCbDragAndDrop->addItem (""); /* KDragAndDropMode_GuestToHost */
-    mCbDragAndDrop->addItem (""); /* KDragAndDropMode_Bidirectional */
+    mCbDragAndDrop->addItem (""); /* KDnDMode_Disabled */
+    mCbDragAndDrop->addItem (""); /* KDnDMode_HostToGuest */
+    mCbDragAndDrop->addItem (""); /* KDnDMode_GuestToHost */
+    mCbDragAndDrop->addItem (""); /* KDnDMode_Bidirectional */
 
 #ifdef Q_WS_MAC
@@ -115 +115 @@
     generalData.m_strSnapshotsHomeDir = QFileInfo(m_machine.GetSettingsFilePath()).absolutePath();
     generalData.m_clipboardMode = m_machine.GetClipboardMode();
-    generalData.m_dragAndDropMode = m_machine.GetDragAndDropMode();
+    generalData.m_dndMode = m_machine.GetDnDMode();
     generalData.m_strDescription = m_machine.GetDescription();
 
@@ -141 +141 @@
     mPsSnapshot->setHomeDir(generalData.m_strSnapshotsHomeDir);
     mCbClipboard->setCurrentIndex(generalData.m_clipboardMode);
-    mCbDragAndDrop->setCurrentIndex(generalData.m_dragAndDropMode);
+    mCbDragAndDrop->setCurrentIndex(generalData.m_dndMode);
     mTeDescription->setPlainText(generalData.m_strDescription);
 
@@ -166 +166 @@
     generalData.m_strSnapshotsFolder = mPsSnapshot->path();
     generalData.m_clipboardMode = (KClipboardMode)mCbClipboard->currentIndex();
-    generalData.m_dragAndDropMode = (KDragAndDropMode)mCbDragAndDrop->currentIndex();
+    generalData.m_dndMode = (KDnDMode)mCbDragAndDrop->currentIndex();
     generalData.m_strDescription = mTeDescription->toPlainText().isEmpty() ?
                                    QString::null : mTeDescription->toPlainText();
@@ -192 +192 @@
             /* Advanced tab: */
             m_machine.SetClipboardMode(generalData.m_clipboardMode);
-            m_machine.SetDragAndDropMode(generalData.m_dragAndDropMode);
+            m_machine.SetDnDMode(generalData.m_dndMode);
             m_machine.SetExtraData(GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no");
             m_machine.SetExtraData(GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no");
@@ -292 +292 @@
 
     /* Drag'n'drop mode */
-    mCbDragAndDrop->setItemText (0, gpConverter->toString (KDragAndDropMode_Disabled));
-    mCbDragAndDrop->setItemText (1, gpConverter->toString (KDragAndDropMode_HostToGuest));
-    mCbDragAndDrop->setItemText (2, gpConverter->toString (KDragAndDropMode_GuestToHost));
-    mCbDragAndDrop->setItemText (3, gpConverter->toString (KDragAndDropMode_Bidirectional));
+    mCbDragAndDrop->setItemText (0, gpConverter->toString (KDnDMode_Disabled));
+    mCbDragAndDrop->setItemText (1, gpConverter->toString (KDnDMode_HostToGuest));
+    mCbDragAndDrop->setItemText (2, gpConverter->toString (KDnDMode_GuestToHost));
+    mCbDragAndDrop->setItemText (3, gpConverter->toString (KDnDMode_Bidirectional));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -37 +37 @@
         , m_strSnapshotsHomeDir(QString())
         , m_clipboardMode(KClipboardMode_Disabled)
-        , m_dragAndDropMode(KDragAndDropMode_Disabled)
+        , m_dndMode(KDnDMode_Disabled)
         , m_strDescription(QString()) {}
     /* Functions: */
@@ -50 +50 @@
                (m_strSnapshotsHomeDir == other.m_strSnapshotsHomeDir) &&
                (m_clipboardMode == other.m_clipboardMode) &&
-               (m_dragAndDropMode == other.m_dragAndDropMode) &&
+               (m_dndMode == other.m_dndMode) &&
                (m_strDescription == other.m_strDescription);
     }
@@ -65 +65 @@
     QString m_strSnapshotsHomeDir;
     KClipboardMode m_clipboardMode;
-    KDragAndDropMode m_dragAndDropMode;
+    KDnDMode m_dndMode;
     QString m_strDescription;
 };