Changeset 444 for trunk/src/gui/kernel

Timestamp:

Dec 30, 2009, 2:32:09 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DND: Implemented dropping text to Qt applications.

Location:

trunk/src/gui/kernel

Files:

• qdnd_pm.cpp (modified) (17 diffs)
• qmime.h (modified) (4 diffs)
• qmime_pm.cpp (modified) (9 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -57 +57 @@
 #include "qt_os2.h"
 
-#define QDND_DEBUG // in pair with qmime_pm.cpp
+#define QDND_DEBUG // in pair with qmime_pm.cpp
 
 #ifdef QDND_DEBUG
@@ -89 +89 @@
     bool hasFormat_sys(const QString &mimeType);
     QStringList formats_sys();
-    QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type);
+    QVariant retrieveData_sys(const QString &mimeType,
+                              QVariant::Type preferredType);
 
 private:
@@ -209 +210 @@
 
 QVariant QPMDragData::retrieveData_sys(const QString &mimeType,
-                                       QVariant::Type type)
+                                       QVariant::Type ype)
 {
     QVariant result;
@@ -222 +223 @@
     foreach (QPMMime::DropWorker *w, workers) {
         if (w->hasFormat(mimeType)) {
-            result = w->retrieveData(mimeType, type);
+            result = w->retrieveData(mimeType, ype);
             break;
         }
@@ -270 +271 @@
 MRESULT qt_dispatchDragAndDrop(QWidget *widget, const QMSG &qmsg)
 {
-    // @todo maybe delete last*Op variables
-
-    static HWND lastDragOverHwnd = 0; // last target window
+    static QWidget *lastDragOverWidget = 0; // last target widget
     static USHORT lastDragOverOp = 0; // last DM_DRAGOVER operation
 
     static USHORT supportedOps = 0; // operations supported by all items
+
 
     static USHORT lastDropReply = DOR_NEVERDROP; // last reply to DM_DRAGOVER
     static USHORT lastOpRequest = DO_UNKNOWN; // last op requested in DM_DRAGOVER
 
-    static Qt::DropAction lastProposedAction = Qt::IgnoreAction; // last proposed action
+    static Qt::DropAction lastProposedAction = Qt::Action; // last proposed action
     static QRect lastAnswerRect; // last accepted rectangle from the target
     // @todo use lastAnswerRect to compress DM_DRAGOVER events
@@ -289 +289 @@
 
     BOOL ok = FALSE;
+
+
 
     switch (qmsg.msg) {
@@ -294 +296 @@
             DEBUG(("DM_DRAGOVER: hwnd %lX di %p x %d y %d", qmsg.hwnd, qmsg.mp1,
                    SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2)));
-
-            bool first = lastDragOverHwnd != qmsg.hwnd;
-            if (first) {
-                // the first DM_DRAGOVER message
-                lastDragOverHwnd = qmsg.hwnd;
-                lastDropReply = DOR_NEVERDROP;
-                lastOpRequest = DO_UNKNOWN;
-                lastProposedAction = Qt::IgnoreAction;
-                lastAnswerRect = QRect();
-                supportedOps = DO_COPYABLE | DO_MOVEABLE | DO_LINKABLE;
-                // ensure drag data is reset (just in case of a wrong msg flow...)
-                dragData.reset();
-            }
-
-            Q_ASSERT(first || widget->acceptDrops());
-            if (!widget->acceptDrops()) {
-                if (!first) {
-                    // Odin32 apps are dramatically bogus, they continue to send
-                    // DM_DRAGOVER even if we reply DOR_NEVERDROP. Simulate
-                    // DM_DRAGLEAVE
-                    lastDragOverHwnd = 0;
-                    dragData.reset();
-                }
-                return MRFROM2SHORT(DOR_NEVERDROP, 0);
-            }
 
             DRAGINFO *info = (DRAGINFO *)qmsg.mp1;
@@ -325 +302 @@
             if (!ok || !info)
                 return MRFROM2SHORT(DOR_NEVERDROP, 0);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             USHORT dropReply = DOR_DROP;
@@ -352 +375 @@
             if (dropReply != DOR_NEVERDROP) {
 
-                bool sourceAllowsOp = false;
-
                 if (first || lastDragOverOp != info->usOperation) {
                     // the current drop operation was changed by a modifier key
@@ -373 +394 @@
                 // the drop. Other platforms seem to do the same.
 
-                // flip y coordinate
-                QPoint pnt(info->xDrop, info->yDrop);
-                pnt.setY(QApplication::desktop()->height() - (pnt.y() + 1));
-                pnt = widget->mapFromGlobal(pnt);
-
-                QDragManager *manager = QDragManager::self();
                 QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
 
@@ -388 +403 @@
                                         QApplication::mouseButtons(),
                                         QApplication::keyboardModifiers());
-                    QApplication::sendEvent(widget, &dee);
+                    QApplication::sendEvent(idget, &dee);
                     // if not allowed or not accepted, always reply DOR_NODROP
-                    // to have DM_DRAGOVER delivered to us again in any case
+                    // to have DM_DRAGOVER delivered to us again 
                     if (sourceAllowsOp && dee.isAccepted()) {
                         dropReply = DOR_DROP;
                         action = dee.dropAction();
+
                         lastAnswerRect = dee.answerRect();
                     } else {
@@ -410 +426 @@
                     dme.setDropAction(action);
                     dme.accept();
-                    QApplication::sendEvent(widget, &dme);
+                    QApplication::sendEvent(idget, &dme);
                     if (sourceAllowsOp && dme.isAccepted()) {
                         dropReply = DOR_DROP;
                         action = dme.dropAction();
+
+
                     } else {
                         dropReply = DOR_NODROP;
@@ -431 +449 @@
 
             // Odin32 apps produce incorrect message flow, ignore
-            Q_ASSERT(lastDragOverHwnd != 0);
-            if (lastDragOverHwnd == 0)
+            Q_ASSERT(lastDragOver != 0);
+            if (lastDragOver == 0)
                 return 0;
 
-            lastDragOverHwnd = 0;
+            QDragLeaveEvent de;
+            QApplication::sendEvent(lastDragOverWidget, &de);
+
+            lastDragOverWidget = 0;
             dragData.reset();
 
-            if (!widget->acceptDrops())
-                return 0;
-
-            QDragLeaveEvent de;
-            QApplication::sendEvent(widget, &de);
             return 0;
         }
@@ -449 +465 @@
 
             // Odin32 apps produce incorrect message flow, ignore
-            Q_ASSERT(lastDragOverHwnd != 0);
-            if (lastDragOverHwnd == 0)
+            Q_ASSERT(lastDragOver != 0);
+            if (lastDragOver == 0)
                 return 0;
 
             // Odin32 apps send DM_DROP even if we replied DOR_NEVERDROP or
             // DOR_NODROP, simulate DM_DRAGLEAVE
-            Q_ASSERT(lastDropReply == DM_DROP);
-            if (lastDropReply != DM_DROP) {
-                WinSendMsg(qmsg.hwnd, DM_DRAGLEAVE, 0, 0);
+            Q_ASSERT(lastDropReply == DOR_DROP);
+            if (lastDropReply != DOR_DROP) {
+                QMSG qmsg2 = qmsg;
+                qmsg2.msg = DM_DRAGLEAVE;
+                qt_dispatchDragAndDrop(widget, qmsg2);
                 return 0;
             }
-
-            lastDragOverHwnd = 0;
-
-            Q_ASSERT(widget->acceptDrops());
-            if (!widget->acceptDrops())
-                return 0;
 
             DRAGINFO *info = (DRAGINFO *)qmsg.mp1;
@@ -471 +483 @@
             Q_ASSERT(ok && info);
             if (!ok || !info)
-                return MRFROM2SHORT(DOR_NEVERDROP, 0);
-
-            Q_ASSERT(lastOpRequest == info->usOperation);
+                return 0;
 
             // flip y coordinate
@@ -480 +490 @@
             pnt = widget->mapFromGlobal(pnt);
 
+
+
+
+
+
+
+
+
+
             QDragManager *manager = QDragManager::self();
             QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
@@ -492 +511 @@
                 de.setDropAction(action);
 
-            QApplication::sendEvent(widget, &de);
+            QApplication::sendEvent(idget, &de);
 
             if (lastDropReply == DOR_DROP)
                 de.accept();
 
+
             dragData.reset(de.isAccepted());
 

trunk/src/gui/kernel/qmime.h

@@ -148 +148 @@
         virtual HWND hwnd() const = 0;
         // methods implemented if isExclusive() == TRUE and itemCount() == 0
-        virtual DRAGINFO *createDragInfo(const char *name, USHORT supportedOps)
-                                        { return NULL; }
+        virtual DRAGINFO *createDragInfo(const ame, USHORT supportedOps)
+                                        { return ; }
         // methods implemented if itemCount() >= 0
         virtual QByteArray composeFormatString() { return QByteArray(); }
         virtual bool prepare(const char *drm, const char *drf, DRAGITEM *item,
-                             ULONG itemIndex) { return FALSE; }
+                             ULONG itemIndex) { return ; }
         virtual void defaultFileType(const char *&type, const char *&ext) {};
 
@@ -185 +185 @@
         {
         public:
-            virtual const QString &format(const char *drf) const = 0;
+            virtual format(const char *drf) const = 0;
             virtual bool provide(const char *drf, const QByteArray &allData,
                                  ULONG itemIndex, QByteArray &itemData) = 0;
@@ -217 +217 @@
         virtual bool hasFormat(const QString &mimeType) const = 0;
         virtual QStringList formats() const = 0;
-        virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const = 0;
+        virtual QVariant retrieveData(const QString &mimeType,
+                                      QVariant::Type preferredType) const = 0;
 
     private:
@@ -236 +237 @@
         bool hasFormat(const QString &mimeType) const;
         QStringList formats() const;
-        QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+        QVariant retrieveData(const QString &mimeType,
+                              QVariant::Type preferredType) const;
 
         // QPMObjectWindow interface

trunk/src/gui/kernel/qmime_pm.cpp

@@ -60 +60 @@
 #include "qdir.h"
 
-#define QDND_DEBUG // in pair with qdnd_pm.cpp
+#define QDND_DEBUG // in pair with qdnd_pm.cpp
 
 #ifdef QDND_DEBUG
@@ -769 +769 @@
 }
 
-// @todo
+// @todo
 //int QPMMime::DefaultDropWorker::formatCount() const
 //{
@@ -814 +814 @@
 
 QVariant QPMMime::DefaultDropWorker::retrieveData(const QString &mimeType,
-                                                  QVariant::Type type) const
-{
-    Q_UNUSED(type);
-
-    DEBUG(() << "DefaultDropWorker::retrieveData(" << mimeType << ")");
+                                                  QVariant::Type ype) const
+{
+    Q_UNUSED(ype);
+
+    DEBUG(() << "DefaultDropWorker::retrieveData);
 
     QVariant ret;
@@ -1000 +1000 @@
                 bool ok = file.remove();
                 Q_ASSERT((ok = ok));
+
             } else {
                 Q_ASSERT(xfer->hstrRenderToName);
@@ -1088 +1089 @@
             if (d->sending_DM_RENDER)
             {
+
                 DRAGTRANSFER *xfer = (DRAGTRANSFER *) mp1;
-#ifndef QT_NO_DEBUG
                 qWarning("Drag item 0x%08lX sent DM_RENDERCOMPLETE w/o first "
                          "replying to DM_RENDER!\n"
@@ -1420 +1421 @@
     All subclasses must reimplement this pure virtual function.
 */
+
+
 
 // static
@@ -1788 +1791 @@
 QPMMime::DefaultDragWorker *QPMMime::defaultExclDragWorker()
 {
-    static DefaultDragWorker defExclDragWorker(false /* exclusive */);
+    static DefaultDragWorker defExclDragWorker(e /* exclusive */);
     return &defExclDragWorker;
 }
@@ -1821 +1824 @@
                                QVariant::Type preferredType) const;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     const ULONG CF_TextUnicode;
     const ULONG CF_TextHtml;
+
+
+
+
+
+
+
 };
 
@@ -1999 +2062 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////