Changeset 707 for trunk/src

Timestamp:

Apr 26, 2010, 2:40:21 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Process deferred window flush events in Dive mode to make sure the window is properly updated after resizing etc.

Location:

trunk/src/gui/painting

Files:

• qwindowsurface_pm.cpp (modified) (10 diffs)
• qwindowsurface_pm_p.h (modified) (1 diff)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -206 +206 @@
 struct QPMDiveWindowSurfacePrivate
 {
-    QNativeImage *image;
+    QImage *image;
     HDIVE hDive;
     ULONG bufNum;
@@ -214 +214 @@
     SETUP_BLITTER setup;
     QVector<RECTL> rcls;
+
+    struct FlushArgs
+    {
+        QRect from;
+        QPoint to;
+    };
+    QList<FlushArgs> pending;
 };
 
@@ -258 +265 @@
 QPaintDevice *QPMDiveWindowSurface::paintDevice()
 {
-    return &d->image->image;
+    return d->image;
 }
 
@@ -264 +271 @@
                                  const QPoint &offset)
 {
-    if (d->vrnDisabled)
-        return;
-
     // Not ready for painting yet, bail out. This can happen in
     // QWidget::create_sys()
@@ -274 +278 @@
     QRect br = rgn.boundingRect();
 
+    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    QRect wbr = br.translated(-wOffset);
     br.translate(offset);
 
-    // make sure br doesn't exceed the backing storage size (it may happen
+    wbr.setBottom(widget->height() - wbr.bottom() - 1); // flip y coordinate
+
+    if (d->vrnDisabled) {
+        // defer the flush
+        QPMDiveWindowSurfacePrivate::FlushArgs args = { br, wbr.bottomLeft() };
+        d->pending.append(args);
+        return;
+    }
+
+    doFlush(br, wbr.bottomLeft());
+}
+
+void QPMDiveWindowSurface::doFlush(const QRect &from, const QPoint &to)
+{
+#if 0
+    qDebug() << "QPMDiveWindowSurface::doFlush:" << window()
+             << "from" << from << "to" << to;
+#endif
+
+    // make sure from doesn't exceed the backing storage size (it may happen
     // during resize & move due to the different event order)
-    br = br.intersected(QRect(0, 0, d->image->width(), d->image->height()));
-
-    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
-    QRect wbr = br.translated(-offset - wOffset);
-
-#if 0
-    qDebug() << "QPMDiveWindowSurface::flush:" << widget
-             << "br" << br << "vrnDisabled" << d->vrnDisabled;
-#endif
+    QRect src = from.intersected(QRect(0, 0, d->image->width(), d->image->height()));
+    QPoint dst = to - (src.bottomLeft() - from.bottomLeft());
 
     HWND hwnd = window()->winId();
@@ -341 +359 @@
 
     SETUP_BLITTER setupTmp = d->setup;
-    setupTmp.ulSrcWidth = br.width();
-    setupTmp.ulSrcHeight = br.height();
-    setupTmp.ulSrcPosX = br.left();
-    setupTmp.ulSrcPosY = br.top();
-    setupTmp.ulDstWidth = wbr.width();
-    setupTmp.ulDstHeight = wbr.height();
-    setupTmp.lDstPosX = wbr.left();
-    setupTmp.lDstPosY = widget->height() - wbr.bottom() - 1; // flip y coordinate
+    setupTmp.ulSrcWidth = src.width();
+    setupTmp.ulSrcHeight = src.height();
+    setupTmp.ulSrcPosX = src.left();
+    setupTmp.ulSrcPosY = src.top();
+    setupTmp.ulDstWidth = setupTmp.ulSrcWidth;
+    setupTmp.ulDstHeight = setupTmp.ulSrcHeight;
+    setupTmp.lDstPosX = dst.x();
+    setupTmp.lDstPosY = dst.y();
 
     if (memcmp(&d->setup, &setupTmp, d->setup.ulStructLen)) {
@@ -376 +394 @@
                 d->vrnDirty = true;
             d->posDirty = true;
+
+            // process pending flush events
+            foreach(QPMDiveWindowSurfacePrivate::FlushArgs args, d->pending) {
+                doFlush(args.from, args.to);
+            }
+            d->pending.clear();
+
             *result = 0;
             return true;
@@ -406 +431 @@
         }
 
-        QNativeImage *oldImage = d->image;
-
-        d->image = new QNativeImage(width, height, QNativeImage::systemFormat(),
-                                    false, window());
-
-        // Associate the image data pointer with the buffer number. Note: this
-        // will reassociate the existing buffer number with a new data pointer
-        // if the buffer number is not 0
-        // @todo???
+        QImage *oldImage = d->image;
+
+        d->image = new QImage(width, height, QImage::Format_RGB32);
+
+        // associate the image data pointer with the buffer number
         DiveFreeImageBuffer(d->hDive, d->bufNum);
         d->bufNum = 0;
         ULONG rc = DiveAllocImageBuffer(d->hDive, &d->bufNum, FOURCC_BGR4,
                                         width, height,
-                                        d->image->image.bytesPerLine(),
-                                        (PBYTE)const_cast<const QImage &>(d->image->image).bits());
+                                        d->image->bytesPerLine(),
+                                        (PBYTE)const_cast<const QImage *>(d->image)->bits());
 
         if (rc != DIVE_SUCCESS) {
@@ -432 +453 @@
         if (oldImage && hasStaticContents()) {
             // Make sure we use the const version of bits() (no detach).
-            const uchar *src = const_cast<const QImage &>(oldImage->image).bits();
-            uchar *dst = d->image->image.bits();
-
-            const int srcBytesPerLine = oldImage->image.bytesPerLine();
-            const int dstBytesPerLine = d->image->image.bytesPerLine();
-            const int bytesPerPixel = oldImage->image.depth() >> 3;
+            const uchar *src = const_cast<const QImage *>(oldImage)->bits();
+            uchar *dst = d->image->bits();
+
+            const int srcBytesPerLine = oldImage->bytesPerLine();
+            const int dstBytesPerLine = d->image->bytesPerLine();
+            const int bytesPerPixel = oldImage->depth() >> 3;
 
             QRegion staticRegion(staticContents());
             // Make sure we're inside the boundaries of the old image.
-            staticRegion &= QRect(0, 0, oldImage->image.width(), oldImage->image.height());
+            staticRegion &= QRect(0, 0, oldImage->width(), oldImage->height());
             const QVector<QRect> &rects = staticRegion.rects();
             const QRect *srcRect = rects.constData();
@@ -476 +497 @@
 bool QPMDiveWindowSurface::scroll(const QRegion &area, int dx, int dy)
 {
-    if (!d->image || d->image->image.isNull())
+    if (!d->image || d->image->isNull())
         return false;
 
     const QVector<QRect> rects = area.rects();
     for (int i = 0; i < rects.size(); ++i)
-        qt_scrollRectInImage(d->image->image, rects.at(i), QPoint(dx, dy));
+        qt_scrollRectInImage(*d->image, rects.at(i), QPoint(dx, dy));
 
     return true;

trunk/src/gui/painting/qwindowsurface_pm_p.h

@@ -71 +71 @@
     QPaintDevice *paintDevice();
     void flush(QWidget *widget, const QRegion &rgn, const QPoint &offset);
+    void doFlush(const QRect &from, const QPoint &to);
     void setGeometry(const QRect &rect);
     bool scroll(const QRegion &area, int dx, int dy);