Changeset 447 for trunk

Timestamp:

Jan 12, 2010, 12:00:10 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Implemented support for painting in widgets during drag and draw.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (6 diffs)
• qdnd.cpp (modified) (2 diffs)
• qdnd_p.h (modified) (4 diffs)
• qdnd_pm.cpp (modified) (17 diffs)
• qwidget.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -64 +64 @@
 #include "qkeymapper_p.h"
 #include "qcursor_p.h"
+
 
 #define WM_KBDLAYERCHANGED   0x0BD4 // defined in OS2TK45/h/pmbidi.h
@@ -702 +703 @@
 #define SV_WORKAREA_XLEFT   54
 
-#ifndef QT_NO_DRAGANDDROP
-extern MRESULT qt_dispatchDragAndDrop(QWidget *, const QMSG &); // qdnd_pm.cpp
-#endif
-
 /*!
     \internal
@@ -921 +918 @@
 #ifndef QT_NO_DRAGANDDROP
         } else if (msg >= WM_DRAGFIRST && msg <= WM_DRAGLAST) {
-            return qt_dispatchDragAndDrop(widget, qmsg);
+            return dispatchDragAndDrop(widget, qmsg);
 #endif
         } else {
@@ -2142 +2139 @@
     if (rc == RGN_ERROR) { // The update bounding rect is invalid
         GpiDestroyRegion(displayPS, hrgn);
-        d_func()->hd = NULLHANDLE;
         setAttribute(Qt::WA_PendingUpdate, false);
         return false;
@@ -2166 +2162 @@
     if (rcl.xRight <= rcl.xLeft || rcl.yTop <= rcl.yBottom) {
         WinEndPaint(d_func()->hd);
+
         GpiDestroyRegion(displayPS, hrgn);
-        d_func()->hd = NULLHANDLE;
         setAttribute(Qt::WA_PendingUpdate, false);
         return true;
@@ -2173 +2169 @@
 
     // flip y coordinate
-    rcl.yBottom = height() - (rcl.yBottom + 1);
-    rcl.yTop = height() - (rcl.yTop + 1);
-
     // note: right top point is exlusive in rcl
-    QRect updRect(QPoint(rcl.xLeft, rcl.yTop + 1),
-                  QPoint(rcl.xRight - 1, rcl.yBottom));
+    QRect updRect(QPoint(rcl.xLeft, ),
+                  QPoint(rcl.xRight - 1, ));
 
     // Mapping region from system to qt (32 bit) coordinate system.

trunk/src/gui/kernel/qdnd.cpp

@@ -358 +358 @@
     xdndMimeTransferedPixmapIndex = 0;
 #endif
+
+
+
 }
 
@@ -363 +366 @@
 QDragManager::~QDragManager()
 {
+
+
+
 #ifndef QT_NO_CURSOR
     if (restoreCursor)

trunk/src/gui/kernel/qdnd_p.h

@@ -63 +63 @@
 #ifdef Q_WS_MAC
 # include "private/qt_mac_p.h"
+
+
+
+
 #endif
 
@@ -205 +209 @@
     LPDATAOBJECT currentDataObject;
 #elif defined(Q_WS_PM)
-    friend class QPMDragData;
+    friend class Q;
     QPMDragData *d;
 #endif
@@ -267 +271 @@
 #endif
 
+
+
+
+
+
+
+
+
 private:
     QPixmap *pm_cursor;
@@ -272 +284 @@
 #ifdef Q_WS_QWS
     Qt::DropAction currentActionForOverrideCursor;
+
+
+
 #endif
 

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -93 +93 @@
 
 private:
+
 
     void initWorkers();
@@ -102 +103 @@
     DRAGINFO *di;
     QList<QPMMime::DropWorker*> workers;
+
+
+
+
+
+
+
+
+
+
+
+
 };
 
@@ -107 +120 @@
     : initialized(false), dropped(false)
     , gotWorkers(false), di(NULL)
-{
-    QDragManager *manager = QDragManager::self();
-    Q_ASSERT(!manager->dropData->d);
-    manager->dropData->d = this;
+    , lastDragOverWidget(0), lastDragOverOp(0)
+    , supportedOps(0), sourceAllowsOp(false)
+    , lastDropReply(DOR_NEVERDROP), lastOpRequest(DO_UNKNOWN)
+    , lastProposedAction(Qt::CopyAction)
+{
 }
 
@@ -116 +130 @@
 {
     reset();
-
-    QDragManager *manager = QDragManager::self();
-    if (manager) {
-        Q_ASSERT(manager->dropData->d == this);
-        manager->dropData->d = 0;
-    }
 }
 
@@ -265 +273 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*!
  *  \internal
  *  Direct manipulation (Drag & Drop) event handler
  */
-MRESULT qt_dispatchDragAndDrop(QWidget *widget, const QMSG &qmsg)
-{
-    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 bool sourceAllowsOp = false; // does source allow requested operation
-
-    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::CopyAction; // last proposed action
-    static QRect lastAnswerRect; // last accepted rectangle from the target
-    // @todo use lastAnswerRect to compress DM_DRAGOVER events
-
-    static QPMDragData dragData;
-
+MRESULT QDragManager::dispatchDragAndDrop(QWidget *widget, const QMSG &qmsg)
+{
     Q_ASSERT(widget);
 
@@ -291 +314 @@
 
     QDragManager *manager = QDragManager::self();
+
+
+
+
 
     switch (qmsg.msg) {
@@ -312 +339 @@
                 dragOverWidget = widget;
 
-            bool first = lastDragOverWidget != dragOverWidget;
+            bool first = lastDragOverWidget != dragOverWidget;
             if (first) {
                 // the first DM_DRAGOVER message
-                if (lastDragOverWidget != 0) {
+                if (lastDragOverWidget != 0) {
                     // send drag leave to the old widget
-                    dragData.reset();
+                    dragDatareset();
                     QPointer<QWidget> dragOverWidgetGuard(dragOverWidget);
                     QDragLeaveEvent dle;
-                    QApplication::sendEvent(lastDragOverWidget, &dle);
+                    lastDragOverWidget, &dle);
                     if (!dragOverWidgetGuard) {
                         dragOverWidget = widget->childAt(pnt);
@@ -327 +354 @@
                     }
                 }
-                lastDragOverWidget = dragOverWidget;
-                lastDragOverOp = 0;
-                supportedOps = DO_COPYABLE | DO_MOVEABLE | DO_LINKABLE;
-                sourceAllowsOp = false;
-                lastDropReply = DOR_NEVERDROP;
-                lastOpRequest = DO_UNKNOWN;
-                lastProposedAction = manager->defaultAction(toQDragDropActions(supportedOps),
-                                                            Qt::NoModifier);
-                lastAnswerRect = QRect();
+                dragData->lastDragOverWidget = dragOverWidget;
+                dragData->lastDragOverOp = 0;
+                dragData->supportedOps = DO_COPYABLE | DO_MOVEABLE | DO_LINKABLE;
+                dragData->sourceAllowsOp = false;
+                dragData->lastDropReply = DOR_NEVERDROP;
+                dragData->lastOpRequest = DO_UNKNOWN;
+                dragData->lastProposedAction =
+                    manager->defaultAction(toQDragDropActions(dragData->supportedOps),
+                                           Qt::NoModifier);
+                dragData->lastAnswerRect = QRect();
                 // ensure drag data is reset (just in case of a wrong msg flow...)
-                dragData.reset();
+                dragDatareset();
             }
 
@@ -362 +390 @@
                         break;
                     }
-                    supportedOps &= item->fsSupportedOps;
+                    supportedOps &= item->fsSupportedOps;
                 }
                 if (dropReply != DOR_NEVERDROP) {
                     Q_ASSERT(itemCount);
-                    if (!itemCount || !supportedOps) {
+                    if (!itemCount || !supportedOps) {
                         // items don't have even a single common operation...
                         dropReply = DOR_NEVERDROP;