Changeset 61 for trunk/src/kernel/qpainter_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/qpainter_pm.cpp (modified) (27 diffs)

trunk/src/kernel/qpainter_pm.cpp

@@ -42 +42 @@
 #include "qpixmapcache.h"
 #include "qptrlist.h"
-//@@TODO (dmik): later
+/// @todo (dmik) later
 //#include "qprinter.h"
 #include <stdlib.h>
@@ -53 +53 @@
 #include "qfontengine_p.h"
 
-//@@TODO (dmik): does OS/2 have this bug?
-///*
-//  Workaround for win32 bug. When GM_ADVANCED graphicsmode is used with a non identity
-//  matrix, subsequent calls to Ellipse, Chord and Pie will be inclusive. Also after
-//  graphics mode is reset to GM_COMPATIBLE. This causes ellipses to grow in size
-//  after a call to drawText when the painter is transformated.
-//
-//  To work around this we register if a non identity transform is set in
-//  QPainter::nativeXForm() and reduce the size by one if native xform has been used.
-//
-//  Testcase for confirmation is checked in in:
-//  //depot/manualtests/platformbugs/win32/ellipseafteradvgrmode.cpp
-//*/
-
 // QRgb has the same RGB format (0xaarrggbb) as OS/2 uses (ignoring the
 // highest alpha byte) so we just mask alpha to get the valid OS/2 color.
 #define COLOR_VALUE(c) ((flags & RGBColor) ? (c.rgb() & RGB_MASK) : c.pixel())
 
-//@@TODO (dmik): Innotek GCC 3.2.2 beta 4 CSD1 lacks this function in
-//  its version of the toolkit header. This should be fixed soon.
+// Innotek GCC lacks some API functions in its version of OS/2 Toolkit headers
 #if defined(Q_CC_GNU) && !defined(USE_OS2_TOOLKIT_HEADERS)
 extern "C" LONG  APIENTRY GpiQueryNearestPaletteIndex(HPAL hpal, ULONG color);
@@ -100 +85 @@
     rc &= GpiSetAttrs( hps, PRIM_LINE, LBB_BACK_MIX_MODE, 0, (PBUNDLE) &lb );
     return rc;
-}
-
-// helper function to select clip regions to the hps
-void qt_GpiSetClipRegion( HPS hps, HRGN hrgn, int devh, HRGN *hrgnOldRet )
-{
-    if ( hrgn ) {
-        // convert region y coordinates from Qt to GPI (see qregion_pm.cpp)
-        if ( devh ) {
-            POINTL ptl = { 0, devh };
-            GpiOffsetRegion( hps, hrgn, &ptl );
-        }
-    }
-    HRGN hrgnOld;
-    GpiSetClipRegion( hps, hrgn, &hrgnOld );
-    if ( hrgnOldRet )
-        *hrgnOldRet = hrgnOld;
-    else
-        GpiDestroyRegion( hps, hrgnOld );
 }
 
@@ -183 +150 @@
     }
     if ( bg_pixmap ) {
-//@@TODO (dmik): don't realize why the windows code doesn't do it...
         // normalize pixmap offsets according to x and y
         // to ensure that the offsets are always relative to
@@ -224 +190 @@
 {
     d = 0;
-//@@TODO (dmik): later
-//    hasUsedNativeXForm = FALSE;
-//    usingNativeXForm = FALSE;
     flags = IsStartingUp;
     pdev = 0;
@@ -240 +203 @@
     wm_stack = 0;
     hps = 0;
-//@@TODO (dmik): remove?
-//    hpen = 0;
-//    hbrush = 0;
-//    hfont = 0;
     holdpal = 0;
-    holdrgn = 0;
+    holdrgn = HRGN_ERROR;
     hbrushbm = 0;
     pixmapBrush = nocolBrush = FALSE;
@@ -407 +366 @@
     }
 
-    //@@TODO (dmik): possibly pixmapBrush is not needed, hbrushbm and
+    /// @todo (dmik) possibly pixmapBrush is not needed, hbrushbm and
     //  CustomPattern can substitute it.
     pixmapBrush = nocolBrush = FALSE;
@@ -521 +480 @@
     hps = 0;
     holdpal = 0;
-    holdrgn = 0;
+    holdrgn = HRGN_ERROR;
     devh = 0;
 
-    QRegion *pRepaintRgn = 0;
+    QRegion *repaintRgn = 0;
 
     if ( testf(ExtDev) ) {                      // external device
@@ -574 +533 @@
         devh = wh;                              // for final y coord. flipping
         if ( !w->isDesktop() )
-            pRepaintRgn =                       // clip rgn passed from repaint()
+            repaintRgn =                        // clip rgn passed from repaint()
                 (QRegion *) WinQueryWindowULong( w->winId(), QWL_QTCLIPRGN );
         if ( w->testWState(Qt::WState_InPaintEvent) ) {
             hps = w->hps;                       // during paint event
         } else {
-            if ( w->isDesktop() ) {
-                hps = WinGetScreenPS( HWND_DESKTOP );
-            } else {
-                if ( unclipped || w->testWFlags( WPaintUnclipped ) ) {
-                    hps = WinGetClipPS( w->winId(), 0, PSF_PARENTCLIP );
-                } else {
-                    hps = WinGetPS( w->winId() );
-                }
-            }
+            hps = w->getTargetPS ( unclipped ? QWidget::Unclipped :
+                                               QWidget::ClipAll ); 
             w->hps = hps;
         }
@@ -608 +560 @@
             cpen.setColor( color1 );
         }
-//@@TODO (dmik): later
+/// @todo (dmik) later
 //    } else if ( dt == QInternal::Printer ) {  // device is a printer
 //      if ( pdev->handle() )
@@ -634 +586 @@
         cpen = QPen( copyFrom->foregroundColor() );
         bg_col = copyFrom->backgroundColor();
-        pRepaintRgn =
+        repaintRgn =
             (QRegion *) WinQueryWindowULong( copyFrom->winId(), QWL_QTCLIPRGN );
     }
@@ -658 +610 @@
     setBrushOrigin( 0, 0 );
     if ( hps ) {
-        HRGN hrgn = 0;
-        if ( pRepaintRgn ) {
-            // make a shallow copy (for the case if the QWL_QTCLIPRGN pointer
-            // will become invalid -- it should not ever happen though)
-            repaintRgn = *pRepaintRgn;
-            QRegion rgn = repaintRgn;
-            // clip region in OS/2 cannot be used for anything else, make a deep copy
-            rgn.detach();
-            hrgn = rgn.handle();
-            // prevent QRegion's destructor from destroying the region handle
-            // (qt_GpiSetClipRegion does the job)
-            rgn.data->rgn = 0;
+        holdrgn = GpiQueryClipRegion( hps );
+        if ( repaintRgn ) {
+            // ensure that def_crgn is not null after assignment in any case
+            def_crgn = repaintRgn->isNull() ? QRegion( FALSE ) : *repaintRgn; 
         }
-        qt_GpiSetClipRegion( hps, hrgn, devh, &holdrgn );
+        // clip region in GPI cannot be used for anything else, so detach it
+        def_crgn.detach();
+        if ( holdrgn ) {
+            // intersect the original clip region and the region from repaint()
+            if ( def_crgn.isNull() )
+                def_crgn = QRegion( 0, 0, ww, wh );
+            GpiSetClipRegion( hps, 0, NULL ); // deselect holdrgn
+            HRGN hrgn = def_crgn.handle( devh );
+            GpiCombineRegion( hps, hrgn, hrgn, holdrgn, CRGN_AND );  
+        }
+        cur_crgn = def_crgn;
+        if ( !cur_crgn.isNull() )
+            GpiSetClipRegion( hps, cur_crgn.handle( devh ), NULL );
     } else {
         holdrgn = HRGN_ERROR;
@@ -695 +651 @@
         GpiSetPatternSet( hps, LCID_DEFAULT );
         GpiDeleteSetId( hps, LCID_QTPixmapBrush );
-    }
-//@@TODO (dmik): remove or set the LCID_DEFAULT font here?
-//    if ( hfont ) {
-//      SelectObject( hdc, stock_sysfont );
-//      hfont = 0;
-//    }
-    if ( holdrgn != HRGN_ERROR )
-        qt_GpiSetClipRegion( hps, holdrgn, 0, NULL );
-    if ( holdpal )
+        hbrushbm = 0;
+    }
+    if ( holdrgn != HRGN_ERROR ) {
+        GpiSetClipRegion( hps, holdrgn, NULL );
+        holdrgn = HRGN_ERROR;
+    }
+    if ( holdpal ) {
         GpiSelectPalette( hps, holdpal );
+        holdpal = 0;
+    }
     if ( !pdev )
         return FALSE;
@@ -719 +675 @@
     }
 
+    if ( !def_crgn.isNull() )
+        def_crgn = QRegion();
+    cur_crgn = def_crgn;
+    
     if ( pfont ) {
         delete pfont;
@@ -741 +701 @@
 void QPainter::flush()
 {
-//@@TODO (dmik): need something here?
-//    GdiFlush();
 }
 
@@ -945 +903 @@
     }
 
-    HRGN hrgn = 0;
-    QRegion rgn;
+    // the current clip region is stored in cur_crgn, so deselect the handle
+    // to let us operate on it. Note that the assignment op below will destroy
+    // the handle if it is no more referred, so there is no need to do it
+    // explicitly.
+    GpiSetClipRegion( hps, 0, NULL );
 
     if ( enable ) {
-        if ( !repaintRgn.isNull() )
-            rgn = crgn.intersect( repaintRgn );
+        if ( !def_crgn.isNull() )
+            cur_crgn = crgn.intersect( def_crgn );
         else
-            rgn = crgn;
+            cur_crgn = crgn.isNull() ? QRegion( FALSE ) : crgn;
 #ifndef QT_NO_PRINTER
-//@@TODO (dmik): later
+/// @todo (dmik) later
 //      if ( pdev->devType() == QInternal::Printer ) {
 //          double xscale = ((float)pdev->metric( QPaintDeviceMetrics::PdmPhysicalDpiX )) /
@@ -971 +932 @@
 #endif
     } else {
-        if ( !repaintRgn.isNull() )
-            rgn = repaintRgn;
-    }
-
-    if ( !rgn.isNull() ) {
-        // clip region in OS/2 cannot be used for anything else, make a deep copy
-        rgn.detach();
-        hrgn = rgn.handle();
-        // prevent QRegion's destructor from destroying the region handle
-        // (qt_GpiSetClipRegion does the job)
-        rgn.data->rgn = 0;
-    }
-    qt_GpiSetClipRegion( hps, hrgn, devh, NULL );
+        cur_crgn = def_crgn;
+    }
+
+    // clip region in GPI cannot be used for anything else, so detach it
+    cur_crgn.detach();
+    
+    if ( !cur_crgn.isNull() )
+        GpiSetClipRegion( hps, cur_crgn.handle( devh ), NULL );
 }
 
@@ -1315 +1271 @@
         qt_end_geom_line( hps, &gh );
     }
-//@@TODO (dmik): does OS/2 PM have the same bug?
-//    if ( (cpen.width() == 0) && (cpen.style() == SolidLine) )
-//      SetPixelV( hdc, x, y, COLOR_VALUE(cpen.color()) );
 }
 
@@ -1824 +1777 @@
 #endif // QT_NO_BEZIER
 
-//@@TODO (dmik): remove?
-//extern uint qt_bitblt_foreground;             // in qpaintdevice_pm.cpp
-
 void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
                            int sx, int sy, int sw, int sh )
@@ -1887 +1837 @@
 
     if ( txop <= TxTranslate ) {                // use optimized bitBlt
-//@@TODO (dmik): remove?
-//      if ( pixmap.depth() == 1 )
-//          qt_bitblt_foreground = COLOR_VALUE(cpen.color());
         bitBlt( pdev, x, y, &pixmap, sx, sy, sw, sh, (RasterOp)rop );
         return;
@@ -2004 +1951 @@
     */
     QBitmap *mask = (QBitmap *)pixmap.mask();
-//@@TODO (dmik): is OS/2 buggy too?
-//#if 0 // Windows is too buggy, so we just use our own code (which is faster).
     if ( !testf(ExtDev) && txop <= TxTranslate && mask == 0 ) {
         if ( txop == TxTranslate )
@@ -2012 +1957 @@
         return;
     }
-//#endif
     if ( sw*sh < 8192 && sw*sh < 16*w*h ) {
         int tw = sw, th = sh;
@@ -2032 +1976 @@
 }
 
-//@@TODO (dmik): need this at all?
 #if 0
 //
@@ -2157 +2100 @@
         int ypos = y + si->y - ascent;
 
-//@@TODO (dmik): remove
-//#ifndef Q_OS_TEMP
-//      if ( rop != CopyROP ) {
-//          // Doesn't work for non-TrueType fonts, but we dealt with those
-//          // with the bitmap above.
-//          BeginPath(hdc);
-//      }
-//#endif
-
-//@@TODO (dmik): do we really need this? we already have painter->handle()
+/// @todo (dmik) do we really need this? we already have painter->handle()
 //  inside QFontEngine::draw(), and the font should have been selected into
 //  hps by updateFont()
@@ -2179 +2113 @@
 
         fe->draw( this, xpos, ypos, engine, si, textFlags );
-//@@TODO (dmik): need?
+/// @todo (dmik) need?
 //        fe->hps = oldPs;
-
-//@@TODO (dmik): remove
-//      if ( rop != CopyROP ) {
-//#ifndef Q_OS_TEMP
-//          EndPath(hdc);
-//#endif
-//          uint pix = COLOR_VALUE(cpen.data->color);
-//          HBRUSH tbrush = CreateSolidBrush( pix );
-//          SelectObject( hdc, tbrush );
-//#ifndef Q_OS_TEMP
-//          FillPath(hdc);
-//#endif
-//          SelectObject( hdc, hbrush );
-//          DeleteObject( tbrush );
-//      }
     }
 }
@@ -2223 +2142 @@
     y += si->y;
 
-//@@TODO (dmik): do we really need this? we already have painter->handle()
+/// @todo (dmik) do we really need this? we already have painter->handle()
 //  inside QFontEngine::draw(), and the font should have been selected into
 //  hps by updateFont()
@@ -2231 +2150 @@
 
     fe->draw( this, x,  y, engine, si, textFlags );
-//@@TODO (dmik): need?
+/// @todo (dmik) need?
 //    fe->hps = oldPs;
 }