X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/region.cpp diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp index c71d4c605a..d08fd4984c 100644 --- a/src/mac/carbon/region.cpp +++ b/src/mac/carbon/region.cpp @@ -1,46 +1,65 @@ ///////////////////////////////////////////////////////////////////////////// -// 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" -#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() - { - } - - wxRegionRefData(const wxRegionRefData& data) - { - // TODO - } - - ~wxRegionRefData() - { - // TODO - } + wxRegionRefData() + { + m_macRgn.reset( HIShapeCreateMutable() ); + } + + wxRegionRefData(wxCFRef ®ion) + { + m_macRgn.reset( HIShapeCreateMutableCopy(region) ); + } + + 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.reset( HIShapeCreateMutableCopy(data.m_macRgn) ); + } + + virtual ~wxRegionRefData() + { + } + + wxCFRef m_macRgn; }; +#define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn) +#define OTHER_M_REGION(a) (((wxRegionRefData*)(a.m_refData))->m_macRgn) //----------------------------------------------------------------------------- // wxRegion @@ -51,36 +70,106 @@ public: */ wxRegion::wxRegion() { - m_refData = new wxRegionRefData; - // TODO create empty region + m_refData = new wxRegionRefData(); +} + +wxRegion::wxRegion(WXHRGN hRegion ) +{ + wxCFRef< HIShapeRef > shape( (HIShapeRef) hRegion ); + m_refData = new wxRegionRefData(shape); } wxRegion::wxRegion(long x, long y, long w, long h) { - m_refData = new wxRegionRefData; - // TODO create rect region + m_refData = new wxRegionRefData(x , y , w , h ); } wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) { - m_refData = new wxRegionRefData; - // TODO create rect region + 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; - // TODO create rect region + 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); + +#ifndef __LP64__ + + // 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 ) ; + + RgnHandle tempRgn = NewRgn(); + CloseRgn( tempRgn ) ; + + ::SetGWorld( oldWorld, oldGDHandle ); + wxCFRef tempShape( HIShapeCreateWithQDRgn(tempRgn ) ); + m_refData = new wxRegionRefData(tempShape); + DisposeRgn( tempRgn ); + } + else + { + m_refData = new wxRegionRefData; + } +#else + wxFAIL_MSG( "not implemented" ); + m_refData = NULL; +#endif } -/*! - * Destroy the region. - */ wxRegion::~wxRegion() { // m_refData unrefed in ~wxObject } +wxGDIRefData *wxRegion::CreateGDIRefData() const +{ + return new wxRegionRefData; +} + +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxRegionRefData(*wx_static_cast(const wxRegionRefData *, data)); +} + //----------------------------------------------------------------------------- //# Modify region //----------------------------------------------------------------------------- @@ -91,194 +180,215 @@ 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) +// Move the region +bool wxRegion::DoOffset(wxCoord x, wxCoord y) { - // 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); - } - // If ref count is 1, that means it's 'ours' anyway so no action. - - // TODO create rect region + wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") ); - int mode = 0; // TODO platform-specific code - switch (op) - { - case wxRGN_AND: - // TODO - break ; - case wxRGN_OR: - // TODO - break ; - case wxRGN_XOR: - // TODO - break ; - case wxRGN_DIFF: - // TODO - break ; - case wxRGN_COPY: - default: - // TODO - break ; - } + if ( !x && !y ) + // nothing to do + return true; - // TODO do combine region + verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ; - return FALSE; + return true ; } + //! Union /e region with this. -bool wxRegion::Combine(const wxRegion& region, wxRegionOp op) +bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op) { - if (region.Empty()) - return FALSE; + 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); - } + // 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); + } - int mode = 0; // TODO platform-specific code switch (op) { case wxRGN_AND: - // TODO + verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) ); break ; + case wxRGN_OR: - // TODO + verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) ); break ; + case wxRGN_XOR: - // TODO + { + // 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: - // TODO + verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ; break ; + case wxRGN_COPY: default: - // TODO + M_REGION.reset( HIShapeCreateMutableCopy( OTHER_M_REGION(region) ) ); break ; } - // TODO combine region - - return FALSE; -} - -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(long& x, long& y, long&w, long &h) const +bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const { - if (m_refData) { - // TODO get box - } else { - x = y = w = h = 0; - } + 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 { - long 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 +{ + if ( m_refData ) + return HIShapeIsEmpty( M_REGION ) ; + else + return true ; +} + +const WXHRGN wxRegion::GetWXHRGN() const { - // TODO - return FALSE; + 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 +// Does the region contain the rectangle (x, y, w, h)? +wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const { - if (!m_refData) - return wxOutRegion; - - // TODO. Return wxInRegion if within region. - if (0) - return wxInRegion; - else + if (!m_refData) return wxOutRegion; -} -// Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegion::Contains(long x, long y, long w, long h) 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); - // TODO. Return wxInRegion if within region. - if (0) + if ( HIShapeIsRectangular(intersect) && CGRectEqualToRect(rect,bounds) ) return wxInRegion; - else + else if ( HIShapeIsEmpty( intersect ) ) return wxOutRegion; -} - -// Does the region contain the rectangle rect -wxRegionContain wxRegion::Contains(const wxRect& rect) const -{ - if (!m_refData) - return wxOutRegion; - - long x, y, w, h; - x = rect.x; - y = rect.y; - w = rect.GetWidth(); - h = rect.GetHeight(); - return Contains(x, y, w, h); + else + return wxPartRegion; } /////////////////////////////////////////////////////////////////////////////// -// // -// wxRegionIterator // -// // +// // +// wxRegionIterator // +// // /////////////////////////////////////////////////////////////////////////////// /*! * Initialize empty iterator */ -wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL) +wxRegionIterator::wxRegionIterator() + : m_current(0), m_numRects(0), m_rects(NULL) { } wxRegionIterator::~wxRegionIterator() { if (m_rects) - delete[] m_rects; + { + delete [] m_rects; + m_rects = NULL; + } +} + +wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator) + : wxObject() + , m_current(iterator.m_current) + , m_numRects(0) + , m_rects(NULL) +{ + SetRects(iterator.m_numRects, iterator.m_rects); +} + +wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator) +{ + m_current = iterator.m_current; + SetRects(iterator.m_numRects, iterator.m_rects); + + return *this; +} + +/*! + * Set iterator rects for region + */ +void wxRegionIterator::SetRects(long numRects, wxRect *rects) +{ + if (m_rects) + { + delete [] m_rects; + m_rects = NULL; + } + + 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; } /*! @@ -288,76 +398,153 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region) { m_rects = NULL; - Reset(region); + Reset(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; + m_current = 0; + m_region = region; if (m_rects) - delete[] m_rects; - - m_rects = NULL; + { + delete [] m_rects; + m_rects = NULL; + } - if (m_region.Empty()) - m_numRects = 0; - else + if (m_region.IsEmpty()) { - // TODO create m_rects and fill with rectangles for this region m_numRects = 0; } + else + { +#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 + } } /*! * Increment iterator. The rectangle returned is the one after the * incrementation. */ -void wxRegionIterator::operator ++ () +wxRegionIterator& wxRegionIterator::operator ++ () { - if (m_current < m_numRects) - ++m_current; + if (m_current < m_numRects) + ++m_current; + + return *this; } /*! * Increment iterator. The rectangle returned is the one before the * incrementation. */ -void wxRegionIterator::operator ++ (int) +wxRegionIterator wxRegionIterator::operator ++ (int) { - if (m_current < m_numRects) - ++m_current; + wxRegionIterator previous(*this); + + if (m_current < m_numRects) + ++m_current; + + return previous; } 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; +}