X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1208c3103734c8581c9854c344b97323e381897..f8c5636c42238296eb67bf73d1da3c5acb010fee:/src/gtk1/region.cpp diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 8af2c03eee..cb7a12beba 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -16,6 +16,7 @@ #include #include +#define OLDCODE 0 //----------------------------------------------------------------------------- // wxRegion @@ -28,7 +29,9 @@ public: ~wxRegionRefData(); GdkRegion *m_region; +#if OLDCODE wxList m_rects; +#endif }; wxRegionRefData::wxRegionRefData() @@ -40,6 +43,7 @@ wxRegionRefData::~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); +#if OLDCODE wxNode *node = m_rects.First(); while (node) { @@ -47,6 +51,7 @@ wxRegionRefData::~wxRegionRefData() delete r; node = node->Next(); } +#endif } //----------------------------------------------------------------------------- @@ -64,9 +69,16 @@ wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) rect.y = y; rect.width = w; rect.height = h; +#ifdef __WXGTK20__ + gdk_region_union_with_rect( reg, &rect ); + M_REGIONDATA->m_region = reg; +#else 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 ) @@ -78,9 +90,16 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) rect.y = topLeft.y; rect.width = bottomRight.x - rect.x; rect.height = bottomRight.y - rect.y; +#ifdef __WXGTK20__ + gdk_region_union_with_rect( reg, &rect ); + M_REGIONDATA->m_region = reg; +#else 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 ) @@ -92,9 +111,16 @@ wxRegion::wxRegion( const wxRect& rect ) g_rect.y = rect.y; g_rect.width = rect.width; g_rect.height = rect.height; +#ifdef __WXGTK20__ + gdk_region_union_with_rect( reg, &g_rect ); + M_REGIONDATA->m_region = reg; +#else 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() @@ -131,17 +157,28 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { m_refData = new wxRegionRefData(); GdkRegion *reg = gdk_region_new(); +#ifdef __WXGTK20__ + gdk_region_union_with_rect( reg, &rect ); + M_REGIONDATA->m_region = reg; +#else M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); gdk_region_destroy( reg ); +#endif } else { +#ifdef __WXGTK20__ + gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); +#else GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; +#endif } +#if OLDCODE M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); +#endif return TRUE; } @@ -162,10 +199,15 @@ bool wxRegion::Union( const wxRegion& region ) M_REGIONDATA->m_region = gdk_region_new(); } +#ifdef __WXGTK20__ + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); +#else GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; +#endif +#if OLDCODE wxNode *node = region.GetRectList()->First(); while (node) { @@ -173,6 +215,7 @@ 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; } @@ -215,9 +258,13 @@ bool wxRegion::Intersect( const wxRegion& region ) return TRUE; } +#ifdef __WXGTK20__ + gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); +#else GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; +#endif return TRUE; } @@ -258,9 +305,13 @@ bool wxRegion::Subtract( const wxRegion& region ) M_REGIONDATA->m_region = gdk_region_new(); } +#ifdef __WXGTK20__ + gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); +#else GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; +#endif return TRUE; } @@ -293,7 +344,7 @@ bool wxRegion::Xor( const wxRect& rect ) bool wxRegion::Xor( const wxRegion& region ) { if (region.IsNull()) - return NULL; + return FALSE; if (!m_refData) { @@ -301,10 +352,15 @@ bool wxRegion::Xor( const wxRegion& region ) M_REGIONDATA->m_region = gdk_region_new(); } +#ifdef __WXGTK20__ + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); +#else GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; +#endif +#if OLDCODE wxNode *node = region.GetRectList()->First(); while (node) { @@ -312,6 +368,7 @@ 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; } @@ -322,7 +379,7 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const y = 0; w = -1; h = -1; - if (m_refData) + if (!m_refData) return; GdkRectangle rect; @@ -402,16 +459,22 @@ 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 //----------------------------------------------------------------------------- +#if OLDCODE + IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); wxRegionIterator::wxRegionIterator() @@ -432,22 +495,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 @@ -482,4 +545,135 @@ 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; + } + } + } + } +} + +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); + +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; +} + +#endif