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

Timestamp:

Jul 8, 2015 1:58:33 PM (10 years ago)

Author:

vboxsync

Message:

DnD: FE/Qt: UIDnDMIMEData: Try to fix the drop target handling on OS X.

Location:

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

Files:

• UIDnDMIMEData.cpp (modified) (6 diffs)
• UIDnDMIMEData.h (modified) (2 diffs)

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

@@ -45 +45 @@
     , m_enmState(Dragging)
     , m_vaData(QVariant::Invalid)
+#ifdef RT_OS_DARWIN
+    , m_fCanDrop(false)
+#endif
 {
     LogFlowThisFuncEnter();
 
 #ifdef DEBUG
-    LogFlowFunc(("Number of formats: %d\n", lstFormats.size()));
-    for (int i = 0; i < lstFormats.size(); i++)
-        LogFlowFunc(("\tFormat %d: %s\n", i, lstFormats.at(i).toAscii().constData()));
+    LogFlowFunc(("Number of formats: %d\n", m_lstFormats.size()));
+    for (int i = 0; i < m_lstFormats.size(); i++)
+        LogFlowFunc(("\tFormat %d: %s\n", i, m_lstFormats.at(i).toAscii().constData()));
+#endif
+
+#ifdef RT_OS_DARWIN
+    connect(this, SIGNAL(notifyDropped()), this, SLOT(sltDropped()));
 #endif
 }
@@ -57 +64 @@
 QStringList UIDnDMIMEData::formats(void) const
 {
+    LogFlowFuncEnter();
     return m_lstFormats;
 }
@@ -62 +70 @@
 bool UIDnDMIMEData::hasFormat(const QString &strMIMEType) const
 {
-    bool fRc = (m_curAction != Qt::IgnoreAction);
+    bool fRc = false;
+
+#ifdef RT_OS_DARWIN
+    if (strMIMEType.compare("application/x-qt-mime-type-name", Qt::CaseInsensitive) == 0)
+        fRc = true;
+#endif
+
+    if (!fRc)
+        fRc = m_curAction != Qt::IgnoreAction; 
+
     LogFlowFunc(("%s: %RTbool (QtMimeData: %RTbool, curAction=0x%x)\n",
                  strMIMEType.toStdString().c_str(), fRc, QMimeData::hasFormat(strMIMEType), m_curAction));
+
+#ifdef RT_OS_DARWIN
+    /*
+     * On OS X hasFormat() only seems to get called on a successful 
+     * drop, that is, if the host knows (and the user accepts) the drop operation. 
+     *  
+     * As we can't do here much since this is a const'ed function we're emitting a 
+     * signal to ourselves in order to let us know that we can start receiving data 
+     * from the guest within the next retrieveData() call. 
+     */
+    emit notifyDropped();
+#endif
+
     return fRc;
 }
+
+#ifdef RT_OS_DARWIN
+void UIDnDMIMEData::sltDropped(void)
+{
+    LogFlowFuncEnter();
+    m_fCanDrop = true;
+}
+#endif
 
 /**
@@ -82 +120 @@
                  m_enmState, m_curAction, m_defAction, strMIMEType.toStdString().c_str(), vaType, QVariant::typeToName(vaType)));
 
-    bool fCanDrop = true;
+    bool fCanDrop = true; /* Accept by default. */
 
 #ifdef RT_OS_WINDOWS
-    /* On Windows this function will be called several times by Qt's
+    /* 
+     * On Windows this function will be called several times by Qt's
      * OLE-specific internals to figure out which data formats we have
-     * to offer. So just assume we can drop data here for a start.* */
-    fCanDrop = true;
+     * to offer. So just assume we can drop data here for a start.
+     */ 
+#elif defined(RT_OS_DARWIN)
+    /*
+     * On OS X we rely on an internal flag which gets set in the overriden 
+     * hasFormat() function. That function only gets called on a successful drop 
+     * so that we can tell if we have to start receiving data the next time 
+     * we come by here. 
+     */
+    fCanDrop = m_fCanDrop;
 #else
-    /* On non-Windows our state gets updated via an own event filter
+    /* 
+     * On non-Windows our state gets updated via an own event filter
      * (see UIDnDMimeData::eventFilter). This filter will update the current
-     * operation state for us (based on the mouse buttons). */
+     * operation state for us (based on the mouse buttons). 
+     */ 
     if (m_curAction == Qt::IgnoreAction)
     {
@@ -139 +188 @@
     }
 
+#ifdef RT_OS_DARWIN
+    LogFlowFunc(("Returning data for Cocoa\n"));
+    return QMimeData::retrieveData(strMIMEType, vaType);
+#else
     LogFlowFunc(("Skipping request, state=%RU32 ...\n", m_enmState));
     return QVariant(QVariant::Invalid); /* Return a NULL variant. */
+#endif
 }
 
@@ -204 +258 @@
     m_curAction = dropAction;
 }
-

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

@@ -67 +67 @@
      int getData(const QString &strMIMEType, QVariant::Type vaType, QVariant &vaData) const;
 
+#ifdef RT_OS_DARWIN
+     void notifyDropped(void) const;
+#endif
+
 public slots:
 
+    /**
+     * Slot indicating that the current drop target has been changed. 
+     * @note Does not work on OS X. 
+     */
     void sltDropActionChanged(Qt::DropAction dropAction);
+
+#ifdef RT_OS_DARWIN
+    /**
+     * Slot indicating that the host wants us to drop the 
+     * data from the guest to the host. 
+     */
+    void sltDropped(void);
+#endif
 
 protected:
@@ -111 +127 @@
     mutable State     m_enmState;
     mutable QVariant  m_vaData;
+
+#ifdef RT_OS_DARWIN
+    /** Flag indicating whether we can drop data from the
+     *  guest to the host or not. */
+    bool              m_fCanDrop;
+#endif
 };