X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dcbb6d0d98b4b85ba1ba66cec336ea5ead333b7..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/region.cpp?ds=sidebyside diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp index b4dddad04b..20d5d46b7d 100644 --- a/src/mac/carbon/region.cpp +++ b/src/mac/carbon/region.cpp @@ -1,49 +1,61 @@ ///////////////////////////////////////////////////////////////////////////// -// File: region.cpp +// File: src/mac/carbon/region.cpp // Purpose: Region class -// Author: Markus Holzem/Julian Smart/AUTHOR +// Author: Stefan Csomor // Created: Fri Oct 24 10:46:34 MET 1997 -// RCS-ID: $Id$ -// Copyright: (c) 1997 Markus Holzem/Julian Smart/AUTHOR +// RCS-ID: $Id$ +// Copyright: (c) 1997 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "region.h" -#endif +#include "wx/wxprec.h" #include "wx/region.h" -#include "wx/gdicmn.h" -#include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) - IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" #endif +#include "wx/mac/uma.h" + +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) + //----------------------------------------------------------------------------- // wxRegionRefData implementation //----------------------------------------------------------------------------- -class WXDLLEXPORT wxRegionRefData : public wxGDIRefData { +class WXDLLEXPORT wxRegionRefData : public wxGDIRefData +{ public: wxRegionRefData() { - m_macRgn = NewRgn() ; + m_macRgn.reset( HIShapeCreateMutable() ); + } + + wxRegionRefData(HIShapeRef hRegion) + { + m_macRgn.reset( HIShapeCreateMutableCopy(hRegion) ); + } + + wxRegionRefData(long x, long y, long w, long h) + { + CGRect r = CGRectMake(x,y,w,h); + wxCFRef rect(HIShapeCreateWithRect(&r)); + m_macRgn.reset( HIShapeCreateMutableCopy(rect) ); } wxRegionRefData(const wxRegionRefData& data) : wxGDIRefData() { - m_macRgn = NewRgn() ; - CopyRgn( data.m_macRgn , m_macRgn ) ; + m_macRgn.reset( HIShapeCreateMutableCopy(data.m_macRgn) ); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { - DisposeRgn( m_macRgn ) ; } - RgnHandle m_macRgn ; + + wxCFRef m_macRgn; }; #define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn) @@ -58,36 +70,83 @@ public: */ wxRegion::wxRegion() { - m_refData = new wxRegionRefData; + m_refData = new wxRegionRefData(); } wxRegion::wxRegion(WXHRGN hRegion ) { - m_refData = new wxRegionRefData; - CopyRgn( (RgnHandle) hRegion , (RgnHandle) M_REGION ) ; + m_refData = new wxRegionRefData(hRegion); } wxRegion::wxRegion(long x, long y, long w, long h) { - m_refData = new wxRegionRefData; - SetRectRgn( (RgnHandle) M_REGION , x , y , x+w , y+h ) ; + m_refData = new wxRegionRefData(x , y , w , h ); } wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) { - m_refData = new wxRegionRefData; - SetRectRgn( (RgnHandle) M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ; + m_refData = new wxRegionRefData(topLeft.x , topLeft.y , + topLeft.x - bottomRight.x , + topLeft.y - bottomRight.y); } wxRegion::wxRegion(const wxRect& rect) { + m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height); +} + +wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle)) +{ + wxUnusedVar(n); + wxUnusedVar(points); + +#if 0 // ndef __LP64__ m_refData = new wxRegionRefData; - SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ; + + // TODO : any APIs ? + // OS X somehow does not collect the region invisibly as before, so sometimes things + // get drawn on screen instead of just being combined into a region, therefore we allocate a temp gworld now + + GWorldPtr gWorld = NULL; + GWorldPtr oldWorld; + GDHandle oldGDHandle; + OSStatus err; + Rect destRect = { 0, 0, 1, 1 }; + + ::GetGWorld( &oldWorld, &oldGDHandle ); + err = ::NewGWorld( &gWorld, 32, &destRect, NULL, NULL, 0 ); + if ( err == noErr ) + { + ::SetGWorld( gWorld, GetGDevice() ); + + OpenRgn(); + + wxCoord x1, x2 , y1 , y2 ; + x2 = x1 = points[0].x ; + y2 = y1 = points[0].y ; + + ::MoveTo( x1, y1 ); + for (size_t i = 1; i < n; i++) + { + x2 = points[i].x ; + y2 = points[i].y ; + ::LineTo( x2, y2 ); + } + + // close the polyline if necessary + if ( x1 != x2 || y1 != y2 ) + ::LineTo( x1, y1 ) ; + + CloseRgn( M_REGION ) ; + + ::SetGWorld( oldWorld, oldGDHandle ); + } +#else + wxFAIL_MSG( "not implemented" ); + m_refData = NULL; +#endif } -/*! - * Destroy the region. - */ wxRegion::~wxRegion() { // m_refData unrefed in ~wxObject @@ -103,187 +162,152 @@ void wxRegion::Clear() UnRef(); } -//! Combine rectangle (x, y, w, h) with this. -bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op) -{ - // Don't change shared data - if (!m_refData) - { - m_refData = new wxRegionRefData(); - } - else if (m_refData->GetRefCount() > 1) - { - wxRegionRefData* ref = (wxRegionRefData*)m_refData; - UnRef(); - m_refData = new wxRegionRefData(*ref); - } - RgnHandle rgn = NewRgn() ; - SetRectRgn( rgn , x , y, x+width,y + height ) ; - - switch (op) - { - case wxRGN_AND: - SectRgn( M_REGION , rgn , M_REGION ) ; - break ; - case wxRGN_OR: - UnionRgn( M_REGION , rgn , M_REGION ) ; - break ; - case wxRGN_XOR: - XorRgn( M_REGION , rgn , M_REGION ) ; - break ; - case wxRGN_DIFF: - DiffRgn( M_REGION , rgn , M_REGION ) ; - break ; - case wxRGN_COPY: - default: - CopyRgn( rgn ,M_REGION ) ; - break ; - } +// Move the region +bool wxRegion::DoOffset(wxCoord x, wxCoord y) +{ + wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") ); + + if ( !x && !y ) + // nothing to do + return true; - DisposeRgn( rgn ) ; + verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ; - return TRUE; + return true ; } + //! Union /e region with this. -bool wxRegion::Combine(const wxRegion& region, wxRegionOp op) -{ - if (region.Empty()) - return FALSE; - - // Don't change shared data - if (!m_refData) { - m_refData = new wxRegionRefData(); - } - else if (m_refData->GetRefCount() > 1) - { - wxRegionRefData* ref = (wxRegionRefData*)m_refData; - UnRef(); - m_refData = new wxRegionRefData(*ref); - } +bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op) +{ + wxCHECK_MSG( region.Ok(), false, _T("invalid wxRegion") ); + + // Don't change shared data + if (!m_refData) + { + m_refData = new wxRegionRefData(); + } + else if (m_refData->GetRefCount() > 1) + { + wxRegionRefData* ref = (wxRegionRefData*)m_refData; + UnRef(); + m_refData = new wxRegionRefData(*ref); + } switch (op) { case wxRGN_AND: - SectRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ; + verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) ); break ; + case wxRGN_OR: - UnionRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ; + verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) ); break ; + case wxRGN_XOR: - XorRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ; + { + // XOR is defined as the difference between union and intersection + wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) ); + wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( M_REGION , OTHER_M_REGION(region) ) ); + verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) ); + } break ; + case wxRGN_DIFF: - DiffRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ; + verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ; break ; + case wxRGN_COPY: default: - CopyRgn( OTHER_M_REGION(region) ,M_REGION ) ; + M_REGION.reset( HIShapeCreateMutableCopy( OTHER_M_REGION(region) ) ); break ; } - return TRUE; -} - -bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) -{ - return Combine(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight(), op); + return true; } //----------------------------------------------------------------------------- //# Information on region //----------------------------------------------------------------------------- -// Outer bounds of region -void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const -{ - if (m_refData) - { - Rect box ; - GetRegionBounds( M_REGION , &box ) ; - x = box.left ; - y = box.top ; - w = box.right - box.left ; - h = box.bottom - box.top ; - } - else - { - x = y = w = h = 0; - } +bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const +{ + wxFAIL_MSG( _T("not implemented") ); + + return false; } -wxRect wxRegion::GetBox() const +// Outer bounds of region +bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const { - wxCoord x, y, w, h; - GetBox(x, y, w, h); - return wxRect(x, y, w, h); + if (m_refData) + { + CGRect box ; + HIShapeGetBounds( M_REGION , &box ) ; + x = wx_static_cast(int, box.origin.x); + y = wx_static_cast(int, box.origin.y); + w = wx_static_cast(int, box.size.width); + h = wx_static_cast(int, box.size.height); + + return true; + } + else + { + x = y = w = h = 0; + + return false; + } } // Is region empty? -bool wxRegion::Empty() const +bool wxRegion::IsEmpty() const { - return EmptyRgn( M_REGION ) ; + if ( m_refData ) + return HIShapeIsEmpty( M_REGION ) ; + else + return true ; } const WXHRGN wxRegion::GetWXHRGN() const { - return M_REGION ; + return M_REGION ; } //----------------------------------------------------------------------------- //# Tests //----------------------------------------------------------------------------- -// Does the region contain the point (x,y)? -wxRegionContain wxRegion::Contains(long x, long y) const +// Does the region contain the point? +wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const { - if (!m_refData) - return wxOutRegion; + if (!m_refData) + return wxOutRegion; - // TODO. Return wxInRegion if within region. - if (0) + CGPoint p = { y , x } ; + if (HIShapeContainsPoint( M_REGION , &p ) ) return wxInRegion; - return wxOutRegion; -} - -// Does the region contain the point pt? -wxRegionContain wxRegion::Contains(const wxPoint& pt) const -{ - if (!m_refData) - return wxOutRegion; - Point p = { pt.y , pt.x } ; - if (PtInRgn( p , M_REGION ) ) - return wxInRegion; - return wxOutRegion; } // Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const +wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const { - if (!m_refData) - return wxOutRegion; - - Rect rect = { y , x , y + h , x + w } ; - if (RectInRgn( &rect , M_REGION ) ) - return wxInRegion; - else + if (!m_refData) return wxOutRegion; -} -// Does the region contain the rectangle rect -wxRegionContain wxRegion::Contains(const wxRect& rect) const -{ - if (!m_refData) - return wxOutRegion; + CGRect rect = CGRectMake(r.x,r.y,r.width,r.height); + wxCFRef rectshape(HIShapeCreateWithRect(&rect)); + wxCFRef intersect(HIShapeCreateIntersection(rectshape,M_REGION)); + CGRect bounds; + HIShapeGetBounds(intersect, &bounds); - long x, y, w, h; - x = rect.x; - y = rect.y; - w = rect.GetWidth(); - h = rect.GetHeight(); - return Contains(x, y, w, h); + if ( HIShapeIsRectangular(intersect) && CGRectEqualToRect(rect,bounds) ) + return wxInRegion; + else if ( HIShapeIsEmpty( intersect ) ) + return wxOutRegion; + else + return wxPartRegion; } /////////////////////////////////////////////////////////////////////////////// @@ -302,8 +326,9 @@ wxRegionIterator::wxRegionIterator() wxRegionIterator::~wxRegionIterator() { - if (m_rects) { - delete[] m_rects; + if (m_rects) + { + delete [] m_rects; m_rects = NULL; } } @@ -321,6 +346,7 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator) { m_current = iterator.m_current; SetRects(iterator.m_numRects, iterator.m_rects); + return *this; } @@ -329,17 +355,21 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator) */ void wxRegionIterator::SetRects(long numRects, wxRect *rects) { - if (m_rects) { - delete[] m_rects; + if (m_rects) + { + delete [] m_rects; m_rects = NULL; } - if (rects) + + if (rects && (numRects > 0)) { int i; + m_rects = new wxRect[numRects]; for (i = 0; i < numRects; i++) m_rects[i] = rects[i]; } + m_numRects = numRects; } @@ -356,29 +386,90 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region) /*! * Reset iterator for a new /e region. */ + +#ifndef __LP64__ +OSStatus wxMacRegionToRectsCounterCallback( + UInt16 message, RgnHandle WXUNUSED(region), const Rect *WXUNUSED(rect), void *data ) +{ + long *m_numRects = (long*) data ; + if ( message == kQDRegionToRectsMsgInit ) + { + (*m_numRects) = 0 ; + } + else if (message == kQDRegionToRectsMsgParse) + { + (*m_numRects) += 1 ; + } + + return noErr; +} + +class RegionToRectsCallbackData +{ +public : + wxRect* m_rects ; + long m_current ; +}; + +OSStatus wxMacRegionToRectsSetterCallback( + UInt16 message, RgnHandle WXUNUSED(region), const Rect *rect, void *data ) +{ + if (message == kQDRegionToRectsMsgParse) + { + RegionToRectsCallbackData *cb = (RegionToRectsCallbackData*) data ; + cb->m_rects[cb->m_current++] = wxRect( rect->left , rect->top , rect->right - rect->left , rect->bottom - rect->top ) ; + } + + return noErr; +} +#endif + void wxRegionIterator::Reset(const wxRegion& region) { m_current = 0; m_region = region; - if (m_rects) { - delete[] m_rects; + if (m_rects) + { + delete [] m_rects; m_rects = NULL; } - if (m_region.Empty()) + if (m_region.IsEmpty()) + { m_numRects = 0; + } else { - // we cannot dissolve it into rects on mac - m_rects = new wxRect[1]; - Rect rect ; - GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ; - m_rects[0].x = rect.left; - m_rects[0].y = rect.top; - m_rects[0].width = rect.right - rect.left; - m_rects[0].height = rect.bottom - rect.top; +#ifdef __LP64__ + // copying this to a path and dissecting the path would be an option m_numRects = 1; + m_rects = new wxRect[m_numRects]; + m_rects[0] = m_region.GetBox(); + +#else + RegionToRectsUPP proc = (RegionToRectsUPP) wxMacRegionToRectsCounterCallback; + + OSStatus err = noErr; + RgnHandle rgn = NewRgn(); + HIShapeGetAsQDRgn(OTHER_M_REGION(region), rgn); + + err = QDRegionToRects (rgn, kQDParseRegionFromTopLeft, proc, (void*)&m_numRects); + if (err == noErr) + { + proc = (RegionToRectsUPP) wxMacRegionToRectsSetterCallback; + m_rects = new wxRect[m_numRects]; + RegionToRectsCallbackData data ; + data.m_rects = m_rects ; + data.m_current = 0 ; + QDRegionToRects( rgn , kQDParseRegionFromTopLeft, proc, (void*)&data ); + } + else + { + m_numRects = 0; + } + DisposeRgn( rgn ); +#endif } } @@ -390,6 +481,7 @@ wxRegionIterator& wxRegionIterator::operator ++ () { if (m_current < m_numRects) ++m_current; + return *this; } @@ -409,29 +501,32 @@ wxRegionIterator wxRegionIterator::operator ++ (int) long wxRegionIterator::GetX() const { - if (m_current < m_numRects) - return m_rects[m_current].x; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].x; + + return 0; } long wxRegionIterator::GetY() const { - if (m_current < m_numRects) - return m_rects[m_current].y; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].y; + + return 0; } long wxRegionIterator::GetW() const { - if (m_current < m_numRects) - return m_rects[m_current].width ; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].width ; + + return 0; } long wxRegionIterator::GetH() const { - if (m_current < m_numRects) - return m_rects[m_current].height; - return 0; -} + if (m_current < m_numRects) + return m_rects[m_current].height; + return 0; +}