Changeset 115 for trunk/src

Timestamp:

Aug 17, 2009, 7:06:32 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added OS/2 support to QRasterWindowSurface and to QNativeImage (this gives us rendering of the widget contents in double-buffer mode).

Location:

trunk/src/gui

Files:

• image/qnativeimage.cpp (modified) (1 diff)
• image/qnativeimage_p.h (modified) (2 diffs)
• kernel/qwidget.cpp (modified) (1 diff)
• kernel/qwidget.h (modified) (1 diff)
• painting/qwindowsurface_raster.cpp (modified) (1 diff)

trunk/src/gui/image/qnativeimage.cpp

@@ -141 +141 @@
 }
 
+#elif defined(Q_WS_PM)
+
+QNativeImage::QNativeImage(int width, int height, QImage::Format format,
+                           bool isTextBuffer, QWidget *widget)
+{
+    image = QImage(width, height, format);
+}
+
+QNativeImage::~QNativeImage()
+{
+}
+
+QImage::Format QNativeImage::systemFormat()
+{
+    // @todo support 8-bit indexed colors?
+//  if (QColormap::instance().depth() == 16)
+//      return QImage::Format_RGB16;
+    return QImage::Format_RGB32;
+}
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)

trunk/src/gui/image/qnativeimage_p.h

@@ -56 +56 @@
 #include "qimage.h"
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
 #include "qt_windows.h"
 
@@ -84 +84 @@
     static QImage::Format systemFormat();
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
     HDC hdc;
     HBITMAP bitmap;

trunk/src/gui/kernel/qwidget.cpp

@@ -10359 +10359 @@
         qErrnoWarning("QWidget::releaseDC(): failed to release HDC");
 }
+#elif defined (Q_WS_PM)
+/*!
+    Returns the window system handle of the widget, for low-level
+    access. Using this function is not portable.
+
+    An HPS acquired with getPS() has to be released with releasePS().
+
+    \warning Using this function is not portable.
+*/
+HPS QWidget::getPS() const
+{
+    Q_D(const QWidget);
+    if (d->hd != NULLHANDLE)
+        return (HPS) d->hd;
+    return WinGetPS(winId());
+}
+
+/*!
+    Releases the HPS \a hdc acquired by a previous call to getPS().
+
+    \warning Using this function is not portable.
+*/
+void QWidget::releasePS(HPS hps) const
+{
+    Q_D(const QWidget);
+    // If there is a widget's own ps, the release operation is ignored because
+    // it will be released elsewhere. Otherwise, we assume that the given hps
+    // was acquired by WinGetPS in the getPS() call and release it.
+    if (d->hd == NULLHANDLE)
+        WinReleasePS(hps);
+}
 #else
 /*!

trunk/src/gui/kernel/qwidget.h

@@ -583 +583 @@
     HDC getDC() const;
     void releaseDC(HDC) const;
+#elif defined(Q_WS_PM)
+    HPS getPS() const;
+    void releasePS(HPS) const;
 #else
     Qt::HANDLE handle() const;

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -199 +199 @@
 #endif
 
+#endif
+
+#ifdef Q_WS_PM
+    QRect br = rgn.boundingRect();
+#if 1
+    qDebug("QRasterWindowSurface::flush: [%s] br=%d,%d/%d,%d",
+           QWidgetPrivate::name(widget).constData(),
+           br.x(), br.y(), br.width(), br.height());
+#endif
+
+    HPS wps = widget->getPS();
+
+    // use the reflection + transformation matrix to flip the y axis
+    // @todo check if it's really slower than flipping the image bits instead
+    // @todo I guess we can use DIVE here; check it too
+    MATRIXLF m;
+    m.fxM11 = MAKEFIXED(1, 0);
+    m.fxM12 = 0;
+    m.lM13 = 0;
+    m.fxM21 = 0;
+    m.fxM22 = MAKEFIXED(-1, 0);
+    m.lM23 = 0;
+    m.lM31 = 0;
+    m.lM32 = widget->height() - 1;
+    GpiSetDefaultViewMatrix(wps, 8, &m, TRANSFORM_REPLACE);
+
+    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    QRect wbr = br.translated(-wOffset);
+
+    br.translate(offset);
+
+    BITMAPINFOHEADER2 bmh;
+    memset(&bmh, 0, sizeof(BITMAPINFOHEADER2));
+    bmh.cbFix = sizeof(BITMAPINFOHEADER2);
+    bmh.cPlanes = 1;
+    bmh.cBitCount = 32; // @todo support 8-bit indexed colors?
+    bmh.cx = d->image->width();
+    bmh.cy = d->image->height();
+
+    // Note: target is inclusive-inclusive, source is inclusive-exclusive
+    POINTL ptls[] = { { wbr.left(), wbr.top() },
+                      { wbr.right(), wbr.bottom() },
+                      { br.left(), br.top() },
+                      { br.right() + 1, br.bottom() + 1 } };
+    GpiDrawBits(wps, (PVOID) d->image->image.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
+                ROP_SRCCOPY, BBO_IGNORE);
+
+    widget->releasePS(wps);
 #endif