Changeset 450 for trunk/src

Timestamp:

Jan 19, 2010, 11:30:46 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

kernel: DnD: Made Copy operation work. Fixed several small bugs.

Location:

trunk/src/gui/kernel

Files:

• qdnd_pm.cpp (modified) (20 diffs)
• qmime_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -119 +119 @@
 
     USHORT lastDropReply; // last reply to DM_DRAGOVER
-    USHORT lastOpRequest; // last op requested in DM_DRAGOVER
-
-    Qt::DropAction lastProposedAction; // last proposed action
+
+    Qt::DropAction lastAction; // last target-accepted action
     QRect lastAnswerRect; // last accepted rectangle from the target
 };
@@ -130 +129 @@
     , lastDragOverWidget(0), lastDragOverOp(0)
     , supportedOps(0), sourceAllowsOp(false)
-    , lastDropReply(DOR_NEVERDROP), lastOpRequest(DO_UNKNOWN)
-    , lastProposedAction(Qt::CopyAction)
+    , lastDropReply(DOR_NEVERDROP)
+    , lastAction(Qt::CopyAction)
 {
 }
@@ -379 +378 @@
                 dragData->sourceAllowsOp = false;
                 dragData->lastDropReply = DOR_NEVERDROP;
-                dragData->lastOpRequest = DO_UNKNOWN;
-                dragData->lastProposedAction =
+                dragData->lastAction =
                     manager->defaultAction(toQDragDropActions(dragData->supportedOps),
                                            Qt::NoModifier);
@@ -425 +423 @@
                 if (first || dragData->lastDragOverOp != info->usOperation) {
                     // the current drop operation was changed by a modifier key
-                    dragData->lastDragOverOp = info->usOperation;
                     USHORT realOp = info->usOperation;
                     if (realOp == DO_DEFAULT || realOp == DO_UNKNOWN) {
                         // the default operation is requested
-                        realOp = toPmDragDropOp(dragData->lastProposedAction);
+                        realOp = toPmDragDropOp(dragData->lastAction);
+                    } else {
+                        dragData->lastAction = toQDragDropAction(realOp);
                     }
                     dragData->sourceAllowsOp =
@@ -435 +434 @@
                         ((dragData->supportedOps & DO_COPYABLE) && realOp == DO_COPY) ||
                         ((dragData->supportedOps & DO_LINKABLE) && realOp == DO_LINK);
+                    dragData->lastDragOverOp = realOp;
                 }
 
@@ -443 +443 @@
 
                 QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
-
-                Qt::DropAction action = toQDragDropAction(dragData->lastOpRequest);
 
                 if (first) {
@@ -452 +450 @@
                                         data, QApplication::mouseButtons(),
                                         QApplication::keyboardModifiers());
+                    dee.setDropAction(dragData->lastAction);
                     sendDropEvent(dragOverWidget, &dee);
                     // if not allowed or not accepted, always reply DOR_NODROP
@@ -457 +456 @@
                     if (dragData->sourceAllowsOp && dee.isAccepted()) {
                         dropReply = DOR_DROP;
-                        action = dee.dropAction();
-                        dragData->lastProposedAction = dee.proposedAction();
+                        dragData->lastAction = dee.dropAction();
                         dragData->lastAnswerRect = dee.answerRect();
                     } else {
@@ -474 +472 @@
                                        QApplication::keyboardModifiers());
                     // accept by default, since enter event was accepted.
-                    dme.setDropAction(action);
+                    dme.setDropAction(dragData->lastAction);
                     dme.accept();
                     sendDropEvent(dragOverWidget, &dme);
                     if (dragData->sourceAllowsOp && dme.isAccepted()) {
                         dropReply = DOR_DROP;
-                        action = dme.dropAction();
-                        dragData->lastProposedAction = dme.proposedAction();
+                        dragData->lastAction = dme.dropAction();
                         dragData->lastAnswerRect = dme.answerRect();
                     } else {
@@ -488 +485 @@
 
                 dragData->lastDropReply = dropReply;
-                dragData->lastOpRequest = toPmDragDropOp(action);
             }
 
             DrgFreeDraginfo(info);
 
-            return MRFROM2SHORT(dropReply, dragData->lastOpRequest);
+            return MRFROM2SHORT(dropReply, toPmDragDropOp(dragData->lastAction));
         }
         case DM_DRAGLEAVE: {
@@ -540 +536 @@
             pnt = widget->mapFromGlobal(pnt);
 
-            Q_ASSERT(dragData->lastOpRequest == info->usOperation);
+            Q_ASSERT(dragData->lastDragOverOp == info->usOperation);
 
             Q_ASSERT(dragData->lastDragOverWidget->acceptDrops());
@@ -551 +547 @@
             QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
 
-            Qt::DropAction action = toQDragDropAction(dragData->lastOpRequest);
-
             dragData->setDropped(true);
 
-            QDropEvent de(pnt, action, data, QApplication::mouseButtons(),
+            QDropEvent de(pnt, dragData->lastAction, data, QApplication::mouseButtons(),
                           QApplication::keyboardModifiers());
             if (dragData->lastDropReply == DOR_DROP)
-                de.setDropAction(action);
+                de.setDropAction(dragData->lastAction);
 
             sendDropEvent(dragData->lastDragOverWidget, &de);
@@ -686 +680 @@
                 continue;
             DEBUG(() << "QPMCoopDragWorker: Got worker" << wrk
-                     << "(isExclusive" << wrk->isExclusive() << ", "
+                     << "( isExclusive" << wrk->isExclusive()
                      << "itemCount" << wrk->itemCount() << ") from convertor"
-                     << mime << " (gotExclForMime"
-                     << gotExclForMime << ", " << "gotExcl" << gotExcl
-                     << ", skipExcl" << skipExcl << ", coopLevel"
+                     << mime << "( gotExclForMime" << gotExclForMime
+                     << "gotExcl" << gotExcl
+                     << "skipExcl" << skipExcl << "coopLevel"
                      << coopLevel << ")");
             if (wrk->isExclusive()) {
@@ -748 +742 @@
             if (w->isExclusive() || w->itemCount() > 1) {
                 DEBUG(() << "QPMCoopDragWorker: DragWorker" << w
-                         << "for" << fmt << "(isExclusive" << w->isExclusive()
-                         << ", itemCount" << w->itemCount()
+                         << "for" << fmt << "( isExclusive" << w->isExclusive()
+                         << "itemCount" << w->itemCount()
                          <<") has no fall-back cooperative 1-item worker!");
                 workers.removeLast();
@@ -763 +757 @@
     // (depending on skipExcl) and remove duplicates 
     for (QList<DragWorker*>::iterator it = workers.begin();
-         it <= workers.end();) {
+         it < workers.end();) {
         DragWorker *wrk = *it;
         bool excl = wrk->isExclusive() || wrk->itemCount() > 1;
@@ -776 +770 @@
     foreach (DragWorker *wrk, workers) {
         DEBUG(() << "QPMCoopDragWorker: Will use worker" << wrk
-                 << "(isExclusive" << wrk->isExclusive()
-                 << ", itemCount" << wrk->itemCount() << ")"); 
+                 << "( isExclusive" << wrk->isExclusive()
+                 << "itemCount" << wrk->itemCount() << ")"); 
     }
 #endif
@@ -934 +928 @@
     if (msg == DM_RENDERPREPARE) {
         if (!info) {
-            qWarning("Drop target sent DM_RENDERPREPARE after the DnD session "
-                     "is over!");
+            DEBUG(() << "Drop target sent DM_RENDERPREPARE after the DnD "
+                        "session is over!");
             // free the given DRAGTRANSFER structure to avoud memory leak 
             DRAGTRANSFER *xfer = (DRAGTRANSFER *)mp1;
@@ -961 +955 @@
         DEBUG(() << "QPMCoopDragWorker: Got DM_RENDERPREPARE to"
                  << QPMMime::queryHSTR(xfer->hstrSelectedRMF) << "for item"
-                 << index << "(id" << xfer->pditem->ulItemID << ")");
+                 << index << "( id" << xfer->pditem->ulItemID << ")");
         
         QByteArray drm, drf;
@@ -984 +978 @@
     
     if (msg == DM_RENDER || msg == DM_ENDCONVERSATION) {
-        qWarning("Drop target sent DM_RENDER or DM_ENDCONVERSATION to the "
-                 "drag source window instead of the drag item window!");
+        DEBUG(() << "Drop target sent DM_RENDER or DM_ENDCONVERSATION to the "
+                    "drag source window instead of the drag item window!");
         if (msg == DM_RENDER) {
             // free the given DRAGTRANSFER structure to avoud memory leak 
@@ -1045 +1039 @@
     }
 
-    USHORT supportedOps = toPmDragDropOps(dragPrivate()->possible_actions);
+    USHORT supportedOps = toPmDragDropOps(o->d_func()->possible_actions);
 
     static QPMCoopDragWorker dragWorker;

trunk/src/gui/kernel/qmime_pm.cpp

@@ -309 +309 @@
     bool moveDisallowed = false;
 
-    DEBUG(() << "DefaultDragWorker: Session ended (cancelled" << isCancelled
+    DEBUG(() << "DefaultDragWorker: Session ended ( cancelled" << isCancelled
              << "requests.left" << d->requests.count() << ")");
 
@@ -392 +392 @@
         return false;
 
-    DEBUG(() << "DefaultDragWorker: Preparing item" <<  itemIndex << "(id "
+    DEBUG(() << "DefaultDragWorker: Preparing item" <<  itemIndex << "( id "
              << item->ulItemID << ") for <" << drm << "," << drf << ">");
 
@@ -460 +460 @@
         DEBUG(() << "DefaultDragWorker: Got DM_RENDER to"
                  << queryHSTR(xfer->hstrSelectedRMF) << "for item" << req->index
-                 << "(id " << xfer->pditem->ulItemID << ")");
+                 << "( id " << xfer->pditem->ulItemID << ")");
 
         QByteArray drm, drf;
@@ -513 +513 @@
 
         DEBUG(() << "DefaultDragWorker: Got DO_RENDER for item " << req->index
-                 << "(id " << req->xfer->pditem->ulItemID << ")"
+                 << "( id " << req->xfer->pditem->ulItemID << ")"
                  << "provider"<< req->provider << "drm" << req->drm.data()
                  << "drf" << req->drf.data());