X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7c2d6ffcb6225c445bf5f8c6ed126490345b821..636d266b8993dd831aa47bdd7e673be32166b54a:/src/gtk1/region.cpp?ds=sidebyside diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 9cf22c23eb..b89afd3b4c 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -2,44 +2,107 @@ // 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 #include +// Unfortunately the new way of implementing the region iterator +// doesn't work with GTK+ 2.0 or above (can't access a Region in +// GdkPrivateRegion) +#ifdef __WXGTK20__ +#define OLDCODE 1 +#else +#define OLDCODE 0 +#endif + +#include "wx/log.h" -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// 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 wxList m_rects; +#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 ); +#if OLDCODE wxNode *node = m_rects.First(); while (node) { @@ -47,13 +110,18 @@ wxRegionRefData::~wxRegionRefData() delete r; node = node->Next(); } +#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 ) { @@ -71,7 +139,9 @@ wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); gdk_region_destroy( reg ); #endif +#if OLDCODE M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) ); +#endif } wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) @@ -90,7 +160,9 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); gdk_region_destroy( reg ); #endif +#if OLDCODE M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) ); +#endif } wxRegion::wxRegion( const wxRect& rect ) @@ -109,27 +181,71 @@ wxRegion::wxRegion( const wxRect& rect ) M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect ); gdk_region_destroy( reg ); #endif +#if OLDCODE M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); +#endif } -wxRegion::wxRegion() +wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) { + GdkPoint *gdkpoints = new GdkPoint[n]; + for ( size_t i = 0 ; i < n ; i++ ) + { + gdkpoints[i].x = points[i].x; + gdkpoints[i].y = points[i].y; + } + + m_refData = new wxRegionRefData(); + + GdkRegion* reg = gdk_region_polygon + ( + gdkpoints, + n, + fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE + : GDK_EVEN_ODD_RULE + ); + + M_REGIONDATA->m_region = reg; + + delete [] gdkpoints; } wxRegion::~wxRegion() { } -bool wxRegion::operator == ( const wxRegion& region ) +bool wxRegion::operator==( const wxRegion& region ) { - return m_refData == region.m_refData; + // 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 ) { - return m_refData != region.m_refData; + return !(*this == region); } +void wxRegion::Unshare() +{ + 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(); @@ -156,6 +272,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 @@ -164,8 +282,10 @@ 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 return TRUE; } @@ -180,11 +300,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() ); @@ -194,6 +310,7 @@ bool wxRegion::Union( const wxRegion& region ) M_REGIONDATA->m_region = reg; #endif +#if OLDCODE wxNode *node = region.GetRectList()->First(); while (node) { @@ -201,48 +318,32 @@ bool wxRegion::Union( const wxRegion& region ) M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); node = node->Next(); } +#endif return TRUE; } 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 @@ -250,33 +351,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 ) @@ -290,6 +424,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 @@ -297,33 +433,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 ) @@ -336,6 +459,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() ); @@ -345,6 +472,7 @@ bool wxRegion::Xor( const wxRegion& region ) M_REGIONDATA->m_region = reg; #endif +#if OLDCODE wxNode *node = region.GetRectList()->First(); while (node) { @@ -352,33 +480,38 @@ bool wxRegion::Xor( const wxRegion& region ) M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); node = node->Next(); } +#endif 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 ); } @@ -442,17 +575,21 @@ GdkRegion *wxRegion::GetRegion() const wxList *wxRegion::GetRectList() const { +#if OLDCODE if (!m_refData) return (wxList*) NULL; return &(M_REGIONDATA->m_rects); +#else + return (wxList*) NULL; +#endif } -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxRegionIterator +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); +#if OLDCODE wxRegionIterator::wxRegionIterator() { @@ -472,22 +609,22 @@ void wxRegionIterator::Reset( const wxRegion& region ) wxRegionIterator::operator bool () const { - return m_current < (size_t)m_region.GetRectList()->Number(); + return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number(); } bool wxRegionIterator::HaveRects() const { - return m_current < (size_t)m_region.GetRectList()->Number(); + return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number(); } void wxRegionIterator::operator ++ () { - if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current; + if (HaveRects()) ++m_current; } void wxRegionIterator::operator ++ (int) { - if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current; + if (HaveRects()) ++m_current; } wxCoord wxRegionIterator::GetX() const @@ -522,4 +659,142 @@ wxCoord wxRegionIterator::GetH() const return r->height; } +#else + +// the following structures must match the private structures +// in X11 region code ( xc/lib/X11/region.h ) + +// this makes the Region type transparent +// and we have access to the region rectangles + +struct _XBox { + short x1, x2, y1, y2; +}; + +struct _XRegion { + long size , numRects; + _XBox *rects, extents; +}; + +class wxRIRefData: public wxObjectRefData +{ +public: + + wxRIRefData() : m_rects(0), m_numRects(0){} + ~wxRIRefData(); + + wxRect *m_rects; + size_t m_numRects; + + void CreateRects( const wxRegion& r ); +}; + +wxRIRefData::~wxRIRefData() +{ + delete m_rects; +} + +#include + +void wxRIRefData::CreateRects( const wxRegion& region ) +{ + if( m_rects ) + delete m_rects; + m_rects = 0; + m_numRects= 0; + GdkRegion *gdkregion= region.GetRegion(); + if( gdkregion ){ + Region r= ((GdkRegionPrivate *)gdkregion)->xregion; + if( r ){ + m_numRects= r->numRects; + if( m_numRects ) + { + m_rects= new wxRect[m_numRects]; + for( size_t i=0; irects[i]; + wxRect&wr= m_rects[i]; + wr.x = xr.x1; + wr.y = xr.y1; + wr.width = xr.x2-xr.x1; + wr.height= xr.y2-xr.y1; + } + } + } + } +} + +wxRegionIterator::wxRegionIterator() +{ + m_refData = new wxRIRefData(); + Reset(); +} + +wxRegionIterator::wxRegionIterator( const wxRegion& region ) +{ + m_refData = new wxRIRefData(); + Reset(region); +} + +void wxRegionIterator::Reset( const wxRegion& region ) +{ + m_region = region; + ((wxRIRefData*)m_refData)->CreateRects(region); + Reset(); +} + +bool wxRegionIterator::HaveRects() const +{ + return m_current < ((wxRIRefData*)m_refData)->m_numRects; +} + +wxRegionIterator::operator bool () const +{ + return HaveRects(); +} + +void wxRegionIterator::operator ++ () +{ + if (HaveRects()) ++m_current; +} + +void wxRegionIterator::operator ++ (int) +{ + if (HaveRects()) ++m_current; +} + +wxCoord wxRegionIterator::GetX() const +{ + if( !HaveRects() ) return 0; + return ((wxRIRefData*)m_refData)->m_rects[m_current].x; +} + +wxCoord wxRegionIterator::GetY() const +{ + if( !HaveRects() ) return 0; + return ((wxRIRefData*)m_refData)->m_rects[m_current].y; +} + +wxCoord wxRegionIterator::GetW() const +{ + if( !HaveRects() ) return -1; + return ((wxRIRefData*)m_refData)->m_rects[m_current].width; +} + +wxCoord wxRegionIterator::GetH() const +{ + if( !HaveRects() ) return -1; + 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