Changeset 61 for trunk/src/kernel/qwidget_pm.cpp

Timestamp:

Feb 6, 2006, 10:43:39 PM (20 years ago)

Author:

dmik

Message:

Implemented QRegion(..., QRegion::Eclipse) and QRegion(QPointArray &,...) constructors.
Improved Qt<->GPI region coordinates translation (it's now implicit), QRegion::handle() takes a height of the target devise as an argument (defaults to 0).

File:

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

trunk/src/kernel/qwidget_pm.cpp

@@ -973 +973 @@
         WinValidateRect( winId(), &rcl, FALSE );
 
-        QRegion *pcrgn = 0;
+        Q_ASSERT( !WinQueryWindowULong( winId(), QWL_QTCLIPRGN ) );
+        QRegion reg;
         if ( r != rect() ) {
-            pcrgn = new QRegion( r );
-            WinSetWindowULong( winId(), QWL_QTCLIPRGN, (ULONG) pcrgn );
+            reg = QRegion( r );
+            WinSetWindowULong( winId(), QWL_QTCLIPRGN, (ULONG) &reg );
         }
 
@@ -984 +985 @@
         QApplication::sendEvent( this, &e );
 
-        if ( pcrgn ) {
-            WinSetWindowULong( winId(), QWL_QTCLIPRGN, 0 );
-            delete pcrgn;
-        }
+        WinSetWindowULong( winId(), QWL_QTCLIPRGN, 0 );
     }
 }
@@ -1000 +998 @@
 #endif
         // convert region y coordinates from Qt to GPI (see qregion_pm.cpp)
-        POINTL ptl = { 0, height() };
-        GpiOffsetRegion( qt_display_ps(), reg.handle(), &ptl );
-        WinValidateRegion( winId(), reg.handle(), FALSE );
-        // convert region y coordinates back from GPI to Qt
-        ptl.y = -ptl.y;
-        GpiOffsetRegion( qt_display_ps(), reg.handle(), &ptl );
-
-        QRegion *pcrgn = new QRegion( reg );
-        WinSetWindowULong( winId(), QWL_QTCLIPRGN, (ULONG) pcrgn );
+        WinValidateRegion( winId(), reg.handle( height() ), FALSE );
+
+        Q_ASSERT( !WinQueryWindowULong( winId(), QWL_QTCLIPRGN ) );
+        WinSetWindowULong( winId(), QWL_QTCLIPRGN, (ULONG) &reg );
 
         QPaintEvent e( reg, erase );
@@ -1016 +1009 @@
 
         WinSetWindowULong( winId(), QWL_QTCLIPRGN, 0 );
-        delete pcrgn;
     }
 }
@@ -1413 +1405 @@
     } else if ( !hps ) {
         tmphps = TRUE;
-        lhps = WinGetPS( winId() );
+        lhps = getTargetPS();
     } else {
         tmphps = FALSE;
@@ -1428 +1420 @@
     );
 
-    if ( tmphps ) {
+    if ( tmphps )
         WinReleasePS( lhps );
-        hps = 0;
-    }
 }
 
@@ -1450 +1440 @@
     } else if ( !hps ) {
         tmphps = TRUE;
-        lhps = WinGetPS( winId() );
+        lhps = getTargetPS();
     } else {
         tmphps = FALSE;
         lhps = hps;
     }
-
-    // convert region y coordinates from Qt to GPI (see qregion_pm.cpp)
-    POINTL ptl = { 0, height() };
-    GpiOffsetRegion( lhps, rgn.handle(), &ptl );
 
     HRGN oldRegion = GpiQueryClipRegion( lhps );
@@ -1465 +1451 @@
         GpiSetClipRegion( lhps, 0, NULL );
         newRegion = GpiCreateRegion( lhps, 0, NULL );
-        GpiCombineRegion( lhps, newRegion, oldRegion, rgn.handle(), CRGN_AND );
+        GpiCombineRegion( lhps, newRegion, oldRegion, rgn.handle( height() ),
+                          CRGN_AND );
     } else {
-        newRegion = rgn.handle();
+        newRegion = rgn.handle( height() );
     }
     GpiSetClipRegion( lhps, newRegion, &oldRegion );
@@ -1482 +1469 @@
     GpiSetClipRegion( lhps, oldRegion, NULL );
 
-    // convert region y coordinates back from GPI to Qt
-    ptl.y = -ptl.y;
-    GpiOffsetRegion( lhps, rgn.handle(), &ptl );
-
     if ( oldRegion )
         GpiDestroyRegion( lhps, newRegion );
-    if ( tmphps ) {
+    if ( tmphps )
         WinReleasePS( lhps );
-        hps = 0;
-    }
 }
 
@@ -1882 +1863 @@
 }
 
+/*!
+ *  \internal
+ *
+ *  Obtains a presentaiton space to draw on this widget, set up according
+ *  to widget flags. If \a m != Unclipped and WPaintUnclipped flag is not
+ *  set, a clip region is set on the returned PS according to \a m.
+ *
+ *  The returned handle must be freed using WinReleasePS() after usage.
+ */
+HPS QWidget::getTargetPS( ClipMode m /* = ClipAll */ )
+{
+    HPS widgetPS = 0;
+    
+    if ( isDesktop() ) {
+        widgetPS = WinGetScreenPS( HWND_DESKTOP );
+    } else {
+        if ( m == Unclipped || testWFlags( WPaintUnclipped ) ) {
+            widgetPS = WinGetClipPS( winId(), 0, PSF_PARENTCLIP );
+        } else {
+            widgetPS = WinGetPS( winId() );
+        }
+    }
+
+    return widgetPS;
+}
+