Changeset 1034 for trunk/src/gui/kernel/qwidget_pm.cpp

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.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (13 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -75 +75 @@
 extern MRESULT EXPENTRY QtFrameCtlProc(HWND, ULONG, MPARAM, MPARAM);
 
+#ifndef QT_PM_NATIVEWIDGETMASK
+#define qt_WinSetWindowPos WinSetWindowPos
+#endif
+
 #if !defined(QT_NO_SESSIONMANAGER)
 bool qt_about_to_destroy_wnd = false;
@@ -114 +118 @@
     // this function -- it is done automatically upon process termination.
 }
+
+#ifdef QT_PM_NATIVEWIDGETMASK
 
 /*!
@@ -231 +237 @@
 
 /*!
+    \internal
+
     \enum PWOFlags
     \relates QWidget
@@ -249 +257 @@
 
 /*!
+    \internal
+
     \fn LONG qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl, HRGN hrgn,
                                           LONG op, LONG flags)
@@ -511 +521 @@
                                ULONG fl)
 {
+    // @todo We need to send WM_VRNENABLED/WM_VRNDISABLED to all affected
+    // windows as it turned out that WinSetWindowPos() called with SWP_NOREDRAW
+    // does not do that. The problem here is that it's unknown how to determine
+    // which windows asked to send them visible region change notifications with
+    // WinSetVisibleRegionNotify(). This is the main reason why we do not define
+    // QT_PM_NATIVEWIDGETMASK by default. Not sending those notifications breaks
+    // painting to widgets that depend on this information, e.g. all direct
+    // painting modes using DIVE. Note that this only affects cases when native
+    // windows are created for child widgets. Normally, this is not the case,
+    // all masking is done by Qt and this code is not involved at all, so
+    // disabling it doesn't affect applications.
+
 #if defined(QT_DEBUGWIDGETMASK)
     qDebug() << "qt_WinSetWindowPos: hwnd" << qDebugHWND(hwnd)
@@ -843 +865 @@
 }
 
+#endif // QT_PM_NATIVEWIDGETMASK
+
 /*!
     \internal
@@ -850 +874 @@
     hrgn. hps is the presentation space of hrgn.
  */
-void qt_WinExcludeOverlappingWindows(HWND hwnd, HPS hps, HRGN hrgn)
+static void qt_WinExcludeOverlappingWindows(HWND hwnd, HPS hps, HRGN hrgn)
 {
     HRGN vr = GpiCreateRegion(hps, 0, NULL);
@@ -882 +906 @@
     all clip coordinates are inclusive.
  */
-void qt_WinScrollWindowWell(HWND hwnd, LONG dx, LONG dy, const PRECTL clip = NULL)
+static void qt_WinScrollWindowWell(HWND hwnd, LONG dx, LONG dy,
+                                   const PRECTL clip = NULL)
 {
     WinLockVisRegions(HWND_DESKTOP, TRUE);
@@ -1103 +1128 @@
         // problems with this line enabled in Qt3 on OS/2 in QT_PM_NO_WIDGETMASK
         // mode (terrible flicker in QFileDialog because QSplitter used there
-        // sets WA_PaintUnclipped). This however doesn't make a big difference
-        // now since we don't support QT_PM_NO_WIDGETMASK anymore (read below
-        // about clipping) and is left here just to show where WA_PaintUnclipped
-        // was originally intended to be used.
+        // sets WA_PaintUnclipped). Note that in QT_PM_NATIVEWIDGETMASK mode it
+        // doesn't play any role since all clipping is manually done by us
+        // anyway (see below).
 #if 0
         if (!testAttribute(Qt::WA_PaintUnclipped))
 #endif
         {
+#ifdef QT_PM_NATIVEWIDGETMASK
             // We don't use WS_CLIPSIBLINGS and WS_CLIPCHILDREN because when these
             // styles are set and the child (sibling) window has a non-NULL clip region,
@@ -1123 +1148 @@
             if (topLevel)
                 style |= WS_CLIPSIBLINGS;
+#else
+                style |= WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
+#endif
         }
 
@@ -2488 +2516 @@
 void QWidgetPrivate::setMask_sys(const QRegion &region)
 {
+#ifdef QT_PM_NATIVEWIDGETMASK
     // @todo implement
+#endif
 }
 
@@ -2567 +2597 @@
 }
 
+#ifdef QT_PM_NATIVEWIDGETMASK
+
 /*!
     \internal
@@ -2590 +2622 @@
 }
 
+#endif // QT_PM_NATIVEWIDGETMASK
+
 QT_END_NAMESPACE