Changeset 749 for trunk/src

Timestamp:

Jun 15, 2010, 4:52:07 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: OS/2: Exported qt_WinProcessWindowObstacles().

Location:

trunk/src/gui/kernel

Files:

• qwidget_pm.cpp (modified) (7 diffs)
• qwindowdefs_pm.h (modified) (2 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -230 +230 @@
 }
 
-/** \internal flags for qt_WinProcessWindowObstacles() */
-enum {
-    PWO_Children = 0x01,
-    PWO_Sibings = 0x02,
-    PWO_Ancestors = 0x04,
-    PWO_Screen = 0x08,
-    PWO_TopLevel = 0x80000000,
-    // PWO_Default is suitable in most cases (for simple paint operations)
-    PWO_Default = PWO_Children | PWO_Sibings | PWO_Ancestors | PWO_Screen,
-};
-
 /*!
     \internal
 
-    Helper function to collect all relative windows intersecting with the
-    given window and placed above it in z-order.
-
-    \param hwnd  window in question
-    \param prcl  rectangle (in window coordinates) to limit processing to
-                 (if null, the whole window rectange is used)
-    \param hrgn  region where to combine all obstacles
-                 (if 0, obstacles are directly validated instead of collecting)
-    \param op    region operation perfomed when combining obstacles (CRGN_*)
-    \param flags flags defining the scope (PWO_* ORed together)
-
-    \return complexity of the combined region (only when \a hrgn is not 0)
+    Helper function to collect all relative windows intersecting with the given
+    \a hwnd and placed above it in z-order. The area of interest is limited to
+    the \a prcl rectangle (in window coordinates) which may be NULL to indicate
+    the whole window. If \a hrgn is not NULL, all found obstacles are combined
+    with the given region using the \a op operation (CRGN_*); otherwise they are
+    directly validated on the window. The scope of relativeness is defined by
+    the \fl argument which is one or more PWO_* flags OR-ed together.
+
+    Returns the complexity of the combined region (only when \a hrgn is not
+    NULL). Note that if no combining occurs (e.g. no relatives in the requested
+    scope), the return value is RGN_NULL regardless of the original complexity
+    of \a hrgn.
  */
-static LONG qt_WinProcessWindowObstacles(HWND hwnd, PRECTL prcl, HRGN hrgn,
-                                         LONG op, LONG flags = PWO_Default)
+LONG qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl, HRGN hrgn,
+                                  LONG op, LONG flags)
 {
     Q_ASSERT(hwnd);
@@ -279 +268 @@
     HRGN whrgn = GpiCreateRegion(displayPS, 0, NULL);
 
-    LONG cmplx = RGN_NULL;
+    LONG cmplx;
     HWND relative;
     SWP swp;
+
+    bool cmplxChanged = false;
 
     // first, process areas placed outside the screen bounds
@@ -301 +292 @@
             if (hrgn != NULLHANDLE) {
                 cmplx = GpiCombineRegion(displayPS, hrgn, hrgn, whrgn, op);
+                cmplxChanged = true;
             } else {
                 WinValidateRegion(hwnd, whrgn, FALSE);
@@ -336 +328 @@
                 if (hrgn != NULLHANDLE) {
                     cmplx = GpiCombineRegion(displayPS, hrgn, hrgn, whrgn, op);
+                    cmplxChanged = true;
                 } else {
                     WinValidateRegion(hwnd, whrgn, FALSE);
@@ -377 +370 @@
             if (hrgn != NULLHANDLE) {
                 cmplx = GpiCombineRegion(displayPS, hrgn, hrgn, whrgn, op);
+                cmplxChanged = true;
             } else {
                 WinValidateRegion(hwnd, whrgn, FALSE);
@@ -436 +430 @@
                 if (hrgn != NULLHANDLE) {
                     cmplx = GpiCombineRegion(displayPS, hrgn, hrgn, whrgn, op);
+                    cmplxChanged = true;
                 } else {
                     WinValidateRegion(hwnd, whrgn, FALSE);
@@ -448 +443 @@
 
     GpiDestroyRegion(displayPS, whrgn);
+
+    if (hrgn != NULLHANDLE && cmplxChanged == false) {
+        // make sure to return the original complexity of the region
+        RECTL rclDummy;
+        cmplx = GpiQueryRegionBox(displayPS, hrgn, &rclDummy);
+    }
 
     return cmplx;

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -68 +68 @@
 typedef void *MRESULT;
 
+typedef struct _RECTL RECTL;
+typedef RECTL *PRECTL;
+
 typedef HWND WId;
 
@@ -85 +88 @@
 
 Q_GUI_EXPORT QWidget *qt_widget_from_hwnd(HWND hwnd);
+
+/** \internal flags for qt_WinProcessWindowObstacles() */
+enum {
+    PWO_Children = 0x01,
+    PWO_Sibings = 0x02,
+    PWO_Ancestors = 0x04,
+    PWO_Screen = 0x08,
+    PWO_TopLevel = 0x80000000,
+    // PWO_Default is suitable in most cases (for simple paint operations)
+    PWO_Default = PWO_Children | PWO_Sibings | PWO_Ancestors | PWO_Screen,
+};
+
+Q_GUI_EXPORT LONG qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl, HRGN hrgn,
+                                               LONG op, LONG flags = PWO_Default);
 
 // QDebug helpers for debugging various API types