Changeset 712

Timestamp:

Apr 27, 2010, 4:15:04 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed widget painting in Dive mode when the screen color format is not 32-bit.

File:

• trunk/src/gui/painting/qwindowsurface_pm.cpp (modified) (11 diffs)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
-#include "qt_os2.h"
-#include "qlibrary.h"
+#include <qdebug.h>
+
+//#define QDIVE_DEBUG
+
+#if defined QDIVE_DEBUG
+#define DEBUG(a) qDebug a
+#define DEBUG_VAR(v) DEBUG(() << #v << v)
+#define DEBUG_VAR_HEX(v) DEBUG(() << #v << qDebugFmtHex(v))
+#else
+#define DEBUG(a) do {} while(0)
+#define DEBUG_VAR(v) do {} while(0)
+#define DEBUG_VAR_HEX(v) do {} while(0)
+#endif
+
+#include <qt_os2.h>
+#include <qlibrary.h>
 
 #include "qwindowsurface_pm_p.h"
 #include "private/qnativeimage_p.h"
-
-#include "qdebug.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -77 +89 @@
 #define DIVE_BUFFER_GRAPHICS_PLANE                       0x00000001
 #define DIVE_BUFFER_ALTERNATE_PLANE                      0x00000002
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 typedef struct _SETUP_BLITTER {
@@ -140 +175 @@
 
 static
+
+
+
+
 ULONG (APIENTRY *DiveOpen) ( HDIVE *phDiveInst,
                              BOOL   fNonScreenInstance,
@@ -186 +225 @@
 static struct { const char *name; void **entry; } diveDllFuncs[] =
 {
+
     FUNC_ENTRY(DiveOpen),
     FUNC_ENTRY(DiveSetupBlitter),
@@ -200 +240 @@
 static bool diveDllOK = false;
 
+
+
 ////////////////////////////////////////////////////////////////////////////////
 
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 struct QPMDiveWindowSurfacePrivate
@@ -235 +309 @@
     memset(&d->setup, 0, sizeof(SETUP_BLITTER));
 
-    // Note that DiveBlitImage() seems to ignore fccSrcColorFormat and
-    // fccSrcColorFormat which is not a big surprise because both values are
-    // known (the source color format is specified at buffer creation time
-    // and the screen color format is always known). Also note that specifying
-    // values other than FOURCC_LUT8/R565/BGR3 causes a crash in DiveBlitImage()
-    // no matter what the actual source format is. FOURCC_SCRN seems to work.
-    d->setup.fccSrcColorFormat = FOURCC_SCRN;
+    // note that fccSrcColorFormat overrides the value specified during the
+    // source buffer creation, so they must match
+    d->setup.fccSrcColorFormat = fourccScreenToBuffer(diveCaps.fccColorEncoding);
     d->setup.fccDstColorFormat = FOURCC_SCRN;
 
@@ -296 +366 @@
 void QPMDiveWindowSurface::doFlush(const QRect &from, const QPoint &to)
 {
-#if 0
-    qDebug() << "QPMDiveWindowSurface::doFlush:" << window()
-             << "from" << from << "to" << to;
-#endif
+    DEBUG(() << "QPMDiveWindowSurface::doFlush:" << window()
+             << "from" << from << "to" << to);
 
     // make sure from doesn't exceed the backing storage size (it may happen
@@ -320 +388 @@
         d->setup.lScreenPosY = ptl.y;
         d->setup.ulStructLen = offsetof(SETUP_BLITTER, ulNumDstRects);
+
+
+
     }
 
@@ -353 +424 @@
         GpiDestroyRegion(hps, hrgn);
         window()->releasePS(hps);
+
+
+
+
+
+
     }
 
@@ -441 +518 @@
         QImage *oldImage = d->image;
 
-        d->image = new QImage(width, height, QImage::Format_RGB32);
+        QImage::Format format = fourccToFormat(d->setup.fccSrcColorFormat);
+        Q_ASSERT(format != QImage::Format_Invalid);
+        d->image = new QImage(width, height, format);
 
         // 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,
+        ULONG rc = DiveAllocImageBuffer(d->hDive, &d->bufNum,
+                                        d->setup.fccSrcColorFormat,
                                         width, height,
                                         d->image->bytesPerLine(),
                                         (PBYTE)const_cast<const QImage *>(d->image)->bits());
-
         if (rc != DIVE_SUCCESS) {
             qWarning("QPMDiveWindowSurface::setGeometry: DiveAllocImageBuffer "
@@ -528 +607 @@
             }
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }