Changeset 1034 for trunk/src/gui/painting

Timestamp:

Aug 29, 2011, 1:43:52 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Disable native window masking code as it is not complete.

This code is only necessary for child widgets that have native windows.
Applications using this approach are very rare (they include e.g. video
players that paint to Qt widgets on their own using native window IDs)
and they don't need masking in these widgets or their ancestors anyway.

The current implementation lacks some functionality -- in particular, it
cannot properly issue WM_VRNENABLED/WM_VRNDISABLED notifications
which breaks those video players, so that keeping it enabled makes little
to no sense.

The relevant code remains in place but guarded by the
QT_PM_NATIVEWIDGETMASK compiler macro so that it can be enabled
as needed for further experiments. See also #203 for more details.

Location:

trunk/src/gui/painting

Files:

• qwindowsurface_pm.cpp (modified) (5 diffs)
• qwindowsurface_raster.cpp (modified) (9 diffs)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -608 +608 @@
         bmh.cy = d->image->height();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
         int wh = widget->height();
 
@@ -623 +624 @@
             GpiSetClipRegion(wps, wrgn, &oldRgn);
             wrgn = oldRgn;
-
+#endif
             // Note: target is inclusive-inclusive, source is inclusive-exclusive
             POINTL ptls[] = { { wbr.left(), wbr.top() },
@@ -631 +632 @@
             GpiDrawBits(wps, (PVOID) const_cast<const QImage *>(d->image)->bits(),
                         (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+
+#ifdef QT_PM_NATIVEWIDGETMASK
         }
 
         if (wrgn != NULLHANDLE)
             GpiDestroyRegion(wps, wrgn);
+#endif
 
         widget->releasePS(wps);
@@ -696 +700 @@
         HWND hwndWidget = widget->internalWinId();
         ULONG rc = WinQueryVisibleRegion(hwndWidget, hrgn);
+#ifdef QT_PM_NATIVEWIDGETMASK
         if (rc != RGN_ERROR) {
             // substract children from the visible region, if any
             rc = qt_WinProcessWindowObstacles(hwndWidget, NULL, hrgn,
                                               CRGN_DIFF, PWO_Children);
+#endif
             if (rc != RGN_ERROR && hwnd != hwndWidget) {
                 // translate coords to the main widget's coordinate space
@@ -708 +714 @@
                 GpiOffsetRegion(hps, hrgn, &ptlOffset);
             }
-        }
+#ifdef QT_PM_NATIVEWIDGETMASK
+        }
+#endif
 
         if (rc == RGN_RECT || rc == RGN_COMPLEX) {

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -248 +248 @@
     int ih = img.height();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
     // produce a clip region that excludes all descending obstacles
     // (like child widgets with real HWNDs which are not excluded by Qt)
@@ -261 +262 @@
         GpiSetClipRegion(wps, wrgn, &oldRgn);
         wrgn = oldRgn;
-
+#endif
         // Note: target is inclusive-inclusive, source is inclusive-exclusive
         POINTL ptls[] = { { wbr.left(), wh - wbr.bottom() - 1 },
@@ -275 +276 @@
         GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
                     ROP_SRCCOPY, BBO_IGNORE);
+
+#ifdef QT_PM_NATIVEWIDGETMASK
     }
 
     if (wrgn != NULLHANDLE)
         GpiDestroyRegion(wps, wrgn);
+#endif
 
 #elif QT_BITMAP_MIRROR == 2
@@ -306 +310 @@
     bmh.cy = d->image->height();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
     int wh = widget->height();
 
@@ -321 +326 @@
         GpiSetClipRegion(wps, wrgn, &oldRgn);
         wrgn = oldRgn;
-
+#endif
         // Note: target is inclusive-inclusive, source is inclusive-exclusive
         POINTL ptls[] = { { wbr.left(), wbr.top() },
@@ -343 +348 @@
 
         GpiEnableYInversion(wps, oldInversion);
+
+#ifdef QT_PM_NATIVEWIDGETMASK
     }
 
     if (wrgn != NULLHANDLE)
         GpiDestroyRegion(wps, wrgn);
+#endif
 
 #ifndef QT_NO_DEBUG
@@ -391 +399 @@
     bmh.cy = d->image->height();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
     int wh = widget->height();
 
@@ -406 +415 @@
         GpiSetClipRegion(wps, wrgn, &oldRgn);
         wrgn = oldRgn;
-
+#endif
         // Note: target is inclusive-inclusive, source is inclusive-exclusive
         POINTL ptls[] = { { wbr.left(), wbr.top() },
@@ -414 +423 @@
         GpiDrawBits(wps, (PVOID) const_cast<const QImage &>(d->image->image).bits(),
                     (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+
+#ifdef QT_PM_NATIVEWIDGETMASK
     }
 
     if (wrgn != NULLHANDLE)
         GpiDestroyRegion(wps, wrgn);
+#endif
 
 #ifndef QT_NO_DEBUG