X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aed8ac3f8954c07fb2dee3e2ba9ae02fa8890428..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/region.cpp?ds=inline diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index a19730b0d0..a18c324df8 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -1,330 +1,319 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: region.cpp +// Name: src/gtk/region.cpp // Purpose: // Author: Robert Roebling +// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "region.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/region.h" -#include -#include +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +#include "wx/gtk/private.h" -class wxRegionRefData: public wxObjectRefData -{ - public: - - wxRegionRefData(); - ~wxRegionRefData(); - - public: - GdkRegion *m_region; - wxList m_rects; -}; +// ---------------------------------------------------------------------------- +// wxRegionRefData: private class containing the information about the region +// ---------------------------------------------------------------------------- -wxRegionRefData::wxRegionRefData() +class wxRegionRefData : public wxGDIRefData { - m_region = (GdkRegion *) NULL; -} +public: + wxRegionRefData() + { + m_region = NULL; + } -wxRegionRefData::~wxRegionRefData() -{ - if (m_region) gdk_region_destroy( m_region ); - - wxNode *node = m_rects.First(); - while (node) + wxRegionRefData(const wxRegionRefData& refData) + : wxGDIRefData() { - wxRect *r = (wxRect*)node->Data(); - delete r; - node = node->Next(); + m_region = gdk_region_copy(refData.m_region); } -} -//----------------------------------------------------------------------------- + virtual ~wxRegionRefData() + { + if (m_region) + gdk_region_destroy( m_region ); + } + + GdkRegion *m_region; +}; + +// ---------------------------------------------------------------------------- +// 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) + +// ---------------------------------------------------------------------------- +// wxRegion construction +// ---------------------------------------------------------------------------- #define M_REGIONDATA ((wxRegionRefData *)m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); - -wxRegion::wxRegion( long x, long y, long w, long h ) +void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { - m_refData = new wxRegionRefData(); - GdkRegion *reg = gdk_region_new(); GdkRectangle rect; rect.x = x; rect.y = y; rect.width = w; rect.height = h; - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) ); + + m_refData = new wxRegionRefData(); + + M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); } -wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) +wxRegion::wxRegion( GdkRegion *region ) { m_refData = new wxRegionRefData(); - GdkRegion *reg = gdk_region_new(); - GdkRectangle rect; - rect.x = topLeft.x; - rect.y = topLeft.y; - rect.width = bottomRight.x - rect.x; - rect.height = bottomRight.y - rect.y; - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) ); + M_REGIONDATA->m_region = gdk_region_copy( region ); } -wxRegion::wxRegion( const wxRect& rect ) +wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) { - m_refData = new wxRegionRefData(); - GdkRegion *reg = gdk_region_new(); - GdkRectangle g_rect; - g_rect.x = rect.x; - g_rect.y = rect.y; - g_rect.width = rect.width; - g_rect.height = rect.height; - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect ); - gdk_region_destroy( reg ); - - wxNode *node = M_REGIONDATA->m_rects.First(); - while (node) + GdkPoint *gdkpoints = new GdkPoint[n]; + for ( size_t i = 0 ; i < n ; i++ ) { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); + gdkpoints[i].x = points[i].x; + gdkpoints[i].y = points[i].y; } -} -wxRegion::wxRegion() -{ m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + + 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() { + // m_refData unrefed in ~wxObject } -bool wxRegion::operator == ( const wxRegion& region ) +wxGDIRefData *wxRegion::CreateGDIRefData() const { - return m_refData == region.m_refData; + return new wxRegionRefData; } -bool wxRegion::operator != ( const wxRegion& region ) +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { - return m_refData != region.m_refData; + return new wxRegionRefData(*(wxRegionRefData *)data); } -void wxRegion::Clear() -{ - UnRef(); - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); -} +// ---------------------------------------------------------------------------- +// wxRegion comparison +// ---------------------------------------------------------------------------- -bool wxRegion::Union( long x, long y, long width, long height ) +bool wxRegion::DoIsEqual(const wxRegion& region) const { - GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height; - GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); - return TRUE; + return gdk_region_equal(M_REGIONDATA->m_region, + M_REGIONDATA_OF(region)->m_region); } -bool wxRegion::Union( const wxRect& rect ) +// ---------------------------------------------------------------------------- +// wxRegion operations +// ---------------------------------------------------------------------------- + +void wxRegion::Clear() { - GdkRectangle g_rect; - g_rect.x = rect.x; - g_rect.y = rect.y; - g_rect.width = rect.width; - g_rect.height = rect.height; - GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &g_rect ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); - return TRUE; + UnRef(); } -bool wxRegion::Union( const wxRegion& region ) +bool wxRegion::DoUnionWithRect(const wxRect& r) { - GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - - wxNode *node = region.GetRectList()->First(); - while (node) + // workaround for a strange GTK/X11 bug: taking union with an empty + // rectangle results in an empty region which is definitely not what we + // want + if ( r.IsEmpty() ) + return true; + + if ( !m_refData ) { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); + InitRect(r.x, r.y, r.width, r.height); } - - return TRUE; -} + else + { + AllocExclusive(); -bool wxRegion::Intersect( long x, long y, long width, long height ) -{ - wxRegion reg( x, y, width, height ); - Intersect( reg ); - return TRUE; -} + GdkRectangle rect; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; -bool wxRegion::Intersect( const wxRect& rect ) -{ - wxRegion reg( rect ); - Intersect( reg ); - return TRUE; -} + gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); + } -bool wxRegion::Intersect( const wxRegion& region ) -{ - GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - return TRUE; + return true; } -bool wxRegion::Subtract( long x, long y, long width, long height ) +bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxRegion reg( x, y, width, height ); - Subtract( reg ); - return TRUE; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + else + { + AllocExclusive(); + } + + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); + + return true; } -bool wxRegion::Subtract( const wxRect& rect ) +bool wxRegion::DoIntersect( const wxRegion& region ) { - wxRegion reg( rect ); - Subtract( reg ); - return TRUE; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + + if (!m_refData) + { + // intersecting with invalid region doesn't make sense + return false; + } + + AllocExclusive(); + + gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); + + return true; } -bool wxRegion::Subtract( const wxRegion& region ) +bool wxRegion::DoSubtract( const wxRegion& region ) { - GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - return TRUE; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + + if (!m_refData) + { + // subtracting from an invalid region doesn't make sense + return false; + } + + AllocExclusive(); + + gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); + + return true; } -bool wxRegion::Xor( long x, long y, long width, long height ) +bool wxRegion::DoXor( const wxRegion& region ) { - wxRegion reg( x, y, width, height ); - Xor( reg ); - return TRUE; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + + if (!m_refData) + { + return false; + } + + AllocExclusive(); + + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); + + return true; } -bool wxRegion::Xor( const wxRect& rect ) +bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { - wxRegion reg( rect ); - Xor( reg ); - return TRUE; + if (!m_refData) + return false; + + AllocExclusive(); + + gdk_region_offset( M_REGIONDATA->m_region, x, y ); + + return true; } -bool wxRegion::Xor( const wxRegion& region ) +// ---------------------------------------------------------------------------- +// wxRegion tests +// ---------------------------------------------------------------------------- + +bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const { - GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; - - wxNode *node = region.GetRectList()->First(); - while (node) + if ( m_refData ) { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); + GdkRectangle rect; + gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect ); + x = rect.x; + y = rect.y; + w = rect.width; + h = rect.height; + + return true; } - - return TRUE; -} - -void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const -{ - x = 0; - y = 0; - w = -1; - h = -1; - wxNode *node = GetRectList()->First(); - while (node) + else { - wxRect *r = (wxRect*)node->Data(); - if (node == GetRectList()->First()) - { - x = r->x; - y = r->y; - w = r->width; - h = r->height; - } - else - { - if (r->x < x) - { - x = r->x; - w += x - r->x; - } - if (r->y < y) - { - y = r->y; - h += y - r->y; - } - if (r->width+r->x > x+w) - { - w = r->x + r->width - x; - } - if (r->height+r->y > y+h) - { - h = r->y + r->height - y; - } - } - node = node->Next(); + x = 0; + y = 0; + w = -1; + h = -1; + + return false; } } -wxRect wxRegion::GetBox() const +bool wxRegion::IsEmpty() const { - long x = 0; - long y = 0; - long w = -1; - long h = -1; - GetBox( x, y, w, h ); - return wxRect( x, y, w, h ); -} + if (!m_refData) + return true; -bool wxRegion::Empty() const -{ return gdk_region_empty( M_REGIONDATA->m_region ); } -wxRegionContain wxRegion::Contains( long x, long y ) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { + if (!m_refData) + return wxOutRegion; + if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) return wxInRegion; else return wxOutRegion; } -wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const +wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const { + if (!m_refData) + return wxOutRegion; + GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect ); switch (res) { @@ -335,99 +324,154 @@ wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const return wxOutRegion; } -wxRegionContain wxRegion::Contains(const wxPoint& pt) const +GdkRegion *wxRegion::GetRegion() const { - return Contains( pt.x, pt.y ); + if (!m_refData) + return (GdkRegion*) NULL; + + return M_REGIONDATA->m_region; } -wxRegionContain wxRegion::Contains(const wxRect& rect) const +// ---------------------------------------------------------------------------- +// wxRegionIterator +// ---------------------------------------------------------------------------- + +wxRegionIterator::wxRegionIterator() { - return Contains( rect.x, rect.y, rect.width, rect.height ); + Init(); + Reset(); } -GdkRegion *wxRegion::GetRegion() const +wxRegionIterator::wxRegionIterator( const wxRegion& region ) { - return M_REGIONDATA->m_region; + Init(); + Reset(region); } -wxList *wxRegion::GetRectList() const +void wxRegionIterator::Init() { - return &(M_REGIONDATA->m_rects); + m_rects = NULL; + m_numRects = 0; } -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - -wxRegionIterator::wxRegionIterator() +wxRegionIterator::~wxRegionIterator() { - m_current = 0; + wxDELETEA(m_rects); } -wxRegionIterator::wxRegionIterator( const wxRegion& region ) +void wxRegionIterator::CreateRects( const wxRegion& region ) { - m_region = region; - m_current = 0; + wxDELETEA(m_rects); + m_numRects = 0; + + GdkRegion *gdkregion = region.GetRegion(); + if (!gdkregion) + return; + + GdkRectangle *gdkrects = NULL; + gint numRects = 0; + gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); + + m_numRects = numRects; + if (numRects) + { + m_rects = new wxRect[m_numRects]; + for (size_t i=0; i < m_numRects; ++i) + { + GdkRectangle &gr = gdkrects[i]; + wxRect &wr = m_rects[i]; + wr.x = gr.x; + wr.y = gr.y; + wr.width = gr.width; + wr.height = gr.height; + } + } + g_free( gdkrects ); } void wxRegionIterator::Reset( const wxRegion& region ) { m_region = region; - m_current = 0; + CreateRects(region); + Reset(); } -wxRegionIterator::operator bool () const -{ - return m_current < m_region.GetRectList()->Number(); -} - -bool wxRegionIterator::HaveRects() const -{ - return m_current < m_region.GetRectList()->Number(); +bool wxRegionIterator::HaveRects() const +{ + return m_current < m_numRects; } -void wxRegionIterator::operator ++ () +wxRegionIterator& wxRegionIterator::operator ++ () { - if (m_current < m_region.GetRectList()->Number()) ++m_current; + if (HaveRects()) + ++m_current; + + return *this; } -void wxRegionIterator::operator ++ (int) +wxRegionIterator wxRegionIterator::operator ++ (int) { - if (m_current < m_region.GetRectList()->Number()) ++m_current; + wxRegionIterator tmp = *this; + + if (HaveRects()) + ++m_current; + + return tmp; } wxCoord wxRegionIterator::GetX() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->x; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + + return m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->y; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + + return m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->width; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + + return m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->height; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + + return m_rects[m_current].height; +} + +wxRect wxRegionIterator::GetRect() const +{ + wxRect r; + if( HaveRects() ) + r = m_rects[m_current]; + + return r; } +wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) +{ + wxDELETEA(m_rects); + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + for ( unsigned int n = 0; n < m_numRects; n++ ) + m_rects[n] = ri.m_rects[n]; + } + else + { + m_rects = NULL; + } + + return *this; +}