X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d52e91c98083f6ec9d7c4a9e392240e6fad5ed04..6443de026310552cacd68a6d0318e73d14929680:/src/gtk1/region.cpp diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index ce742d343b..2c31667721 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -2,15 +2,24 @@ // Name: gtk/region.cpp // Purpose: // Author: Robert Roebling +// Modified: VZ at 05.10.00: use Unshare(), comparison fixed // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + #ifdef __GNUG__ -#pragma implementation "region.h" + #pragma implementation "region.h" #endif +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #include "wx/region.h" #include @@ -25,15 +34,18 @@ #define OLDCODE 0 #endif -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +#include "wx/log.h" + +// ---------------------------------------------------------------------------- +// wxRegionRefData: private class containing the information about the region +// ---------------------------------------------------------------------------- -class wxRegionRefData: public wxObjectRefData +class wxRegionRefData : public wxObjectRefData { public: wxRegionRefData(); - ~wxRegionRefData(); + wxRegionRefData(const wxRegionRefData& refData); + virtual ~wxRegionRefData(); GdkRegion *m_region; #if OLDCODE @@ -41,11 +53,51 @@ public: #endif }; +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +#define M_REGIONDATA ((wxRegionRefData *)m_refData) +#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) + +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject); +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxRegionRefData +// ---------------------------------------------------------------------------- + wxRegionRefData::wxRegionRefData() { m_region = (GdkRegion *) NULL; } +wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData) +{ +#ifdef __WXGTK20__ + m_region = gdk_region_copy(refData.m_region); +#else + m_region = gdk_region_new(); + GdkRegion *regCopy = gdk_regions_union(m_region, refData.m_region); + gdk_region_destroy(m_region); + m_region = regCopy; +#endif + +#if OLDCODE + wxNode *node = refData.m_rects.First(); + while (node) + { + wxRect *r = (wxRect*)node->Data(); + m_rects.Append( (wxObject*) new wxRect(*r) ); + node = node->Next(); + } +#endif +} + wxRegionRefData::~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); @@ -61,11 +113,15 @@ wxRegionRefData::~wxRegionRefData() #endif } -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxRegion construction +// ---------------------------------------------------------------------------- #define M_REGIONDATA ((wxRegionRefData *)m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); +wxRegion::wxRegion() +{ +} wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { @@ -130,24 +186,42 @@ wxRegion::wxRegion( const wxRect& rect ) #endif } -wxRegion::wxRegion() +wxRegion::~wxRegion() { } -wxRegion::~wxRegion() +bool wxRegion::operator==( const wxRegion& region ) { + // VZ: compare the regions themselves, not the pointers to ref data! + return gdk_region_equal(M_REGIONDATA->m_region, + M_REGIONDATA_OF(region)->m_region); } -bool wxRegion::operator == ( const wxRegion& region ) +bool wxRegion::operator != ( const wxRegion& region ) { - return m_refData == region.m_refData; + return !(*this == region); } -bool wxRegion::operator != ( const wxRegion& region ) +void wxRegion::Unshare() { - return m_refData != region.m_refData; + if ( !m_refData ) + { + m_refData = new wxRegionRefData; + M_REGIONDATA->m_region = gdk_region_new(); + } + else if ( m_refData->GetRefCount() > 1 ) + { + wxRegionRefData *refData = new wxRegionRefData(*M_REGIONDATA); + UnRef(); + m_refData = refData; + } + //else: we're not shared } +// ---------------------------------------------------------------------------- +// wxRegion operations +// ---------------------------------------------------------------------------- + void wxRegion::Clear() { UnRef(); @@ -174,6 +248,8 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) } else { + Unshare(); + #ifdef __WXGTK20__ gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); #else @@ -182,7 +258,7 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) M_REGIONDATA->m_region = reg; #endif } - + #if OLDCODE M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); #endif @@ -200,11 +276,7 @@ bool wxRegion::Union( const wxRegion& region ) if (region.IsNull()) return FALSE; - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } + Unshare(); #ifdef __WXGTK20__ gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); @@ -229,42 +301,25 @@ bool wxRegion::Union( const wxRegion& region ) bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - wxRegion reg( x, y, width, height ); - Intersect( reg ); - return TRUE; + + return Intersect( reg ); } bool wxRegion::Intersect( const wxRect& rect ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - wxRegion reg( rect ); - Intersect( reg ); - return TRUE; + return Intersect( reg ); } -bool wxRegion::Intersect( const wxRegion& region ) +// this helper function just computes the region intersection without updating +// the list of rectangles each region maintaints: this allows us to call it +// from Intersect() itself without going into infinite recursion as we would +// if we called Intersect() itself recursively +bool wxRegion::IntersectRegionOnly(const wxRegion& region) { - if (region.IsNull()) - return FALSE; + Unshare(); - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - return TRUE; - } - #ifdef __WXGTK20__ gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); #else @@ -272,33 +327,66 @@ bool wxRegion::Intersect( const wxRegion& region ) gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; #endif + return TRUE; } -bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::Intersect( const wxRegion& region ) { + if (region.IsNull()) + return FALSE; + if (!m_refData) { m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); + return TRUE; } - wxRegion reg( x, y, width, height ); - Subtract( reg ); + if ( !IntersectRegionOnly(region) ) + { + GetRectList()->Clear(); + + return FALSE; + } + + // we need to update the rect list as well +#if OLDCODE + wxList& list = *GetRectList(); + wxNode *node = list.First(); + while (node) + { + wxRect *r = (wxRect*)node->Data(); + + wxRegion regCopy = region; + if ( regCopy.IntersectRegionOnly(*r) ) + { + // replace the node with the intersection + *r = regCopy.GetBox(); + } + else + { + // TODO remove the rect from the list + r->width = 0; + r->height = 0; + } + + node = node->Next(); + } +#endif return TRUE; } -bool wxRegion::Subtract( const wxRect& rect ) +bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } + wxRegion reg( x, y, width, height ); + return Subtract( reg ); +} +bool wxRegion::Subtract( const wxRect& rect ) +{ wxRegion reg( rect ); - Subtract( reg ); - return TRUE; + return Subtract( reg ); } bool wxRegion::Subtract( const wxRegion& region ) @@ -312,6 +400,8 @@ bool wxRegion::Subtract( const wxRegion& region ) M_REGIONDATA->m_region = gdk_region_new(); } + Unshare(); + #ifdef __WXGTK20__ gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); #else @@ -319,33 +409,20 @@ bool wxRegion::Subtract( const wxRegion& region ) gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; #endif + return TRUE; } bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - wxRegion reg( x, y, width, height ); - Xor( reg ); - return TRUE; + return Xor( reg ); } bool wxRegion::Xor( const wxRect& rect ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - wxRegion reg( rect ); - Xor( reg ); - return TRUE; + return Xor( reg ); } bool wxRegion::Xor( const wxRegion& region ) @@ -358,6 +435,10 @@ bool wxRegion::Xor( const wxRegion& region ) m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); } + else + { + Unshare(); + } #ifdef __WXGTK20__ gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); @@ -380,29 +461,33 @@ bool wxRegion::Xor( const wxRegion& region ) return TRUE; } +// ---------------------------------------------------------------------------- +// wxRegion tests +// ---------------------------------------------------------------------------- + void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const { - x = 0; - y = 0; - w = -1; - h = -1; - if (!m_refData) - return; - - GdkRectangle rect; - gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect ); - x = rect.x; - y = rect.y; - w = rect.width; - h = rect.height; + if ( m_refData ) + { + GdkRectangle rect; + gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect ); + x = rect.x; + y = rect.y; + w = rect.width; + h = rect.height; + } + else + { + x = 0; + y = 0; + w = -1; + h = -1; + } } wxRect wxRegion::GetBox() const { - wxCoord x = 0; - wxCoord y = 0; - wxCoord w = -1; - wxCoord h = -1; + wxCoord x, y, w, h; GetBox( x, y, w, h ); return wxRect( x, y, w, h ); } @@ -476,14 +561,12 @@ wxList *wxRegion::GetRectList() const #endif } -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxRegionIterator -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- #if OLDCODE -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { Reset(); @@ -563,7 +646,7 @@ wxCoord wxRegionIterator::GetH() const struct _XBox { short x1, x2, y1, y2; }; - + struct _XRegion { long size , numRects; _XBox *rects, extents; @@ -617,8 +700,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { m_refData = new wxRIRefData(); @@ -682,5 +763,14 @@ wxCoord wxRegionIterator::GetH() const return ((wxRIRefData*)m_refData)->m_rects[m_current].height; } +wxRect wxRegionIterator::GetRect() const +{ + wxRect r; + if( HaveRects() ) + r = ((wxRIRefData*)m_refData)->m_rects[m_current]; + + return r; +} + #endif