Changeset 1034 for trunk/src/gui/kernel/qapplication_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/qapplication_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -123 +123 @@
 extern QCursor *qt_grab_cursor();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
 extern void qt_WinQueryClipRegionOrRect(HWND hwnd, HRGN hrgn); // qwidget_pm.cpp
+#endif
 
 extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); // qapplication.cpp
@@ -1191 +1193 @@
                         }
                         if (!dispatch) {
+#ifdef QT_PM_NATIVEWIDGETMASK
                             HPS hps = qt_display_ps();
                             HRGN hrgn = GpiCreateRegion(hps, 0, NULL);
@@ -1199 +1202 @@
                             dispatch = !GpiPtInRegion(hps, hrgn, &pt);
                             GpiDestroyRegion(hps, hrgn);
+#else
+                            QPoint lcpos = widget->mapFromGlobal(cpos);
+                            QRect rect(0, 0, widget->width(), widget->height());
+                            dispatch = !rect.contains(lcpos);
+#endif
                         }
                     }
@@ -2326 +2334 @@
     HPS displayPS = qt_display_ps();
 
+#ifdef QT_PM_NATIVEWIDGETMASK
     // Since we don't use WS_CLIPSIBLINGS and WS_CLIPCHILDREN bits (see
     // qwidget_pm.cpp), we have to validate areas that intersect with our
     // children and siblings, taking their clip regions into account.
     d_func()->validateObstacles();
+#endif
 
     Q_ASSERT(testAttribute(Qt::WA_WState_Created));