Changeset 758

Timestamp:

Jun 22, 2010, 9:20:42 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: OS/2: Applied the solution from r751 to the non-DIVE code path (closes #161).

Location:

trunk/src/gui/painting

Files:

• qwindowsurface_pm.cpp (modified) (1 diff)
• qwindowsurface_raster.cpp (modified) (3 diffs)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -607 +607 @@
         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) const_cast<const QImage *>(d->image)->bits(),
-                    (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+        int wh = widget->height();
+
+        // produce a clip region that excludes all descending obstacles
+        // (like child widgets with real HWNDs which are not excluded by Qt)
+        HWND wwnd = widget->winId();
+        RECTL wrcl = { wbr.left(), wh - wbr.bottom() - 1,
+                       wbr.right() + 1, wh - wbr.top() };
+        HRGN wrgn = GpiCreateRegion(wps, 1L, &wrcl);
+        ULONG rc = qt_WinProcessWindowObstacles(wwnd, NULL, wrgn, CRGN_DIFF,
+                                                PWO_Children);
+        if (rc == RGN_RECT || rc == RGN_COMPLEX) {
+            // set the clip region
+            HRGN oldRgn;
+            GpiSetClipRegion(wps, wrgn, &oldRgn);
+            wrgn = oldRgn;
+
+            // 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) const_cast<const QImage *>(d->image)->bits(),
+                        (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+        }
+
+        if (wrgn != NULLHANDLE)
+            GpiDestroyRegion(wps, wrgn);
 
         widget->releasePS(wps);

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -248 +248 @@
     int ih = img.height();
 
-    // Note: target is inclusive-inclusive, source is inclusive-exclusive
-    POINTL ptls[] = { { wbr.left(), wh - wbr.bottom() - 1 },
-                      { wbr.right(), wh - wbr.top() - 1 },
-                      { br.left(), ih - br.bottom() - 1 },
-                      { br.right() + 1, ih - br.top() } };
+    // produce a clip region that excludes all descending obstacles
+    // (like child widgets with real HWNDs which are not excluded by Qt)
+    HWND wwnd = widget->winId();
+    RECTL wrcl = { wbr.left(), wh - wbr.bottom() - 1,
+                   wbr.right() + 1, wh - wbr.top() };
+    HRGN wrgn = GpiCreateRegion(wps, 1L, &wrcl);
+    ULONG rc = qt_WinProcessWindowObstacles(wwnd, NULL, wrgn, CRGN_DIFF,
+                                            PWO_Children);
+    if (rc == RGN_RECT || rc == RGN_COMPLEX) {
+        // set the clip region
+        HRGN oldRgn;
+        GpiSetClipRegion(wps, wrgn, &oldRgn);
+        wrgn = oldRgn;
+
+        // Note: target is inclusive-inclusive, source is inclusive-exclusive
+        POINTL ptls[] = { { wbr.left(), wh - wbr.bottom() - 1 },
+                          { wbr.right(), wh - wbr.top() - 1 },
+                          { br.left(), ih - br.bottom() - 1 },
+                          { br.right() + 1, ih - br.top() } };
 #if 0
-    qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
-             << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
-             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
-             << "img.size" << img.size() << "img.bits" << img.bits();
-#endif
-    GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
-                ROP_SRCCOPY, BBO_IGNORE);
+        qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
+                 << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
+                 << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
+                 << "img.size" << img.size() << "img.bits" << img.bits();
+#endif
+        GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
+                    ROP_SRCCOPY, BBO_IGNORE);
+    }
+
+    if (wrgn != NULLHANDLE)
+        GpiDestroyRegion(wps, wrgn);
 
 #elif QT_BITMAP_MIRROR == 2
@@ -288 +306 @@
     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 } };
+    int wh = widget->height();
+
+    // produce a clip region that excludes all descending obstacles
+    // (like child widgets with real HWNDs which are not excluded by Qt)
+    HWND wwnd = widget->winId();
+    RECTL wrcl = { wbr.left(), wh - wbr.bottom() - 1,
+                   wbr.right() + 1, wh - wbr.top() };
+    HRGN wrgn = GpiCreateRegion(wps, 1L, &wrcl);
+    ULONG rc = qt_WinProcessWindowObstacles(wwnd, NULL, wrgn, CRGN_DIFF,
+                                            PWO_Children);
+    if (rc == RGN_RECT || rc == RGN_COMPLEX) {
+        // set the clip region
+        HRGN oldRgn;
+        GpiSetClipRegion(wps, wrgn, &oldRgn);
+        wrgn = oldRgn;
+
+        // 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 } };
 #if 0
-    qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
-             << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
-             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
-             << "img.size" << d->image->size() << "img.bits" << d->image->bits();
-#endif
-
-    // setup the Y coordinate inversion (this seems to use the same GPI matrix
-    // transformation internally as we do in method 3 below)
-    LONG oldInversion = GpiQueryYInversion(wps);
-    GpiEnableYInversion(wps, widget->height() - 1);
-
-    GpiDrawBits(wps, (PVOID) const_cast<const QImage &>(d->image->image).bits(),
-                (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
-
-    GpiEnableYInversion(wps, oldInversion);
+        qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
+                 << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
+                 << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
+                 << "img.size" << d->image->size() << "img.bits" << d->image->bits();
+#endif
+
+        // setup the Y coordinate inversion (this seems to use the same GPI matrix
+        // transformation internally as we do in method 3 below)
+        LONG oldInversion = GpiQueryYInversion(wps);
+        GpiEnableYInversion(wps, widget->height() - 1);
+
+        GpiDrawBits(wps, (PVOID) const_cast<const QImage &>(d->image->image).bits(),
+                    (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+
+        GpiEnableYInversion(wps, oldInversion);
+    }
+
+    if (wrgn != NULLHANDLE)
+        GpiDestroyRegion(wps, wrgn);
 
 #ifndef QT_NO_DEBUG
@@ -353 +391 @@
     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) const_cast<const QImage &>(d->image->image).bits(),
-                (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+    int wh = widget->height();
+
+    // produce a clip region that excludes all descending obstacles
+    // (like child widgets with real HWNDs which are not excluded by Qt)
+    HWND wwnd = widget->winId();
+    RECTL wrcl = { wbr.left(), wh - wbr.bottom() - 1,
+                   wbr.right() + 1, wh - wbr.top() };
+    HRGN wrgn = GpiCreateRegion(wps, 1L, &wrcl);
+    ULONG rc = qt_WinProcessWindowObstacles(wwnd, NULL, wrgn, CRGN_DIFF,
+                                            PWO_Children);
+    if (rc == RGN_RECT || rc == RGN_COMPLEX) {
+        // set the clip region
+        HRGN oldRgn;
+        GpiSetClipRegion(wps, wrgn, &oldRgn);
+        wrgn = oldRgn;
+
+        // 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) const_cast<const QImage &>(d->image->image).bits(),
+                    (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+    }
+
+    if (wrgn != NULLHANDLE)
+        GpiDestroyRegion(wps, wrgn);
 
 #ifndef QT_NO_DEBUG
-    // for debug flushing
-    const QImage img = d->image->image;
+    // for debug flushing
+    const QImage img = d->image->image;
 #endif