X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..f5ba273ecd799f652736ce2bc830283787302a56:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index a607e5da6c..0332bd48b6 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -1,21 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: region.cpp +// Name: gtk/region.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifdef __GNUG__ #pragma implementation "region.h" #endif #include "wx/region.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include + //----------------------------------------------------------------------------- // wxRegion @@ -23,33 +23,30 @@ class wxRegionRefData: public wxObjectRefData { - public: - - wxRegionRefData(void); - ~wxRegionRefData(void); - - public: +public: + wxRegionRefData(); + ~wxRegionRefData(); GdkRegion *m_region; wxList m_rects; }; -wxRegionRefData::wxRegionRefData(void) +wxRegionRefData::wxRegionRefData() { - m_region = (GdkRegion *) NULL; + m_region = (GdkRegion *) NULL; } -wxRegionRefData::~wxRegionRefData(void) +wxRegionRefData::~wxRegionRefData() { - if (m_region) gdk_region_destroy( m_region ); - - wxNode *node = m_rects.First(); - while (node) - { - wxRect *r = (wxRect*)node->Data(); - delete r; - node = node->Next(); - } + if (m_region) gdk_region_destroy( m_region ); + + wxNode *node = m_rects.First(); + while (node) + { + wxRect *r = (wxRect*)node->Data(); + delete r; + node = node->Next(); + } } //----------------------------------------------------------------------------- @@ -57,303 +54,358 @@ wxRegionRefData::~wxRegionRefData(void) #define M_REGIONDATA ((wxRegionRefData *)m_refData) IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); - -wxRegion::wxRegion( long x, long y, long w, long h ) + +wxRegion::wxRegion( 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(); + 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) ); } wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) { - 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_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) ); } wxRegion::wxRegion( const wxRect& rect ) { - 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) - { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); - } + 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 ); + M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); } -wxRegion::wxRegion(void) +wxRegion::wxRegion() { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); } -wxRegion::~wxRegion(void) +wxRegion::~wxRegion() { } bool wxRegion::operator == ( const wxRegion& region ) { - return m_refData == region.m_refData; + return m_refData == region.m_refData; } bool wxRegion::operator != ( const wxRegion& region ) { - return m_refData != region.m_refData; + return m_refData != region.m_refData; } -void wxRegion::Clear(void) +void wxRegion::Clear() { - UnRef(); - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + UnRef(); } -bool wxRegion::Union( long x, long y, long width, long height ) +bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - 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; + GdkRectangle rect; + rect.x = x; + rect.y = y; + rect.width = width; + rect.height = height; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + GdkRegion *reg = gdk_region_new(); + M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); + gdk_region_destroy( reg ); + } + 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; + } + + M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); + + return TRUE; } bool wxRegion::Union( const wxRect& rect ) { - 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; + return Union( rect.x, rect.y, rect.width, rect.height ); } bool wxRegion::Union( const wxRegion& region ) { - 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) - { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); - } - - return TRUE; + if (region.IsNull()) + return FALSE; + + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + 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) + { + wxRect *r = (wxRect*)node->Data(); + M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); + node = node->Next(); + } + + return TRUE; } -bool wxRegion::Intersect( long x, long y, long width, long height ) +bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxRegion reg( x, y, width, height ); - Intersect( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( x, y, width, height ); + Intersect( reg ); + return TRUE; } bool wxRegion::Intersect( const wxRect& rect ) { - wxRegion reg( rect ); - Intersect( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( rect ); + Intersect( reg ); + return TRUE; } 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; + if (region.IsNull()) + return FALSE; + + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + return TRUE; + } + + 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; } -bool wxRegion::Subtract( long x, long y, long width, long height ) +bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxRegion reg( x, y, width, height ); - Subtract( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( x, y, width, height ); + Subtract( reg ); + return TRUE; } bool wxRegion::Subtract( const wxRect& rect ) { - wxRegion reg( rect ); - Subtract( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( rect ); + Subtract( reg ); + return TRUE; } bool wxRegion::Subtract( 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; + if (region.IsNull()) + return FALSE; + + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + 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; } -bool wxRegion::Xor( long x, long y, long width, long height ) +bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxRegion reg( x, y, width, height ); - Xor( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( x, y, width, height ); + Xor( reg ); + return TRUE; } bool wxRegion::Xor( const wxRect& rect ) { - wxRegion reg( rect ); - Xor( reg ); - return TRUE; + if (!m_refData) + { + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); + } + + wxRegion reg( rect ); + Xor( reg ); + return TRUE; } bool wxRegion::Xor( const wxRegion& region ) { - 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) - { - wxRect *r = (wxRect*)node->Data(); - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); - node = node->Next(); - } - - 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) - { - wxRect *r = (wxRect*)node->Data(); - if (node == GetRectList()->First()) + if (region.IsNull()) + return FALSE; + + if (!m_refData) { - x = r->x; - y = r->y; - w = r->width; - h = r->height; + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_new(); } - else + + 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 (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; - } + wxRect *r = (wxRect*)node->Data(); + M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) ); + node = node->Next(); } - node = node->Next(); - } + + return TRUE; } -wxRect wxRegion::GetBox(void) const +void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const { - long x = 0; - long y = 0; - long w = -1; - long h = -1; - GetBox( x, y, w, h ); - return wxRect( x, y, w, h ); + 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; } -bool wxRegion::Empty(void) const +wxRect wxRegion::GetBox() const { - return gdk_region_empty( M_REGIONDATA->m_region ); + wxCoord x = 0; + wxCoord y = 0; + wxCoord w = -1; + wxCoord h = -1; + GetBox( x, y, w, h ); + return wxRect( x, y, w, h ); } -wxRegionContain wxRegion::Contains( long x, long y ) const +bool wxRegion::Empty() const { - if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) - return wxInRegion; - else - return wxOutRegion; + if (!m_refData) + return TRUE; + + return gdk_region_empty( M_REGIONDATA->m_region ); } -wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const +wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const { - GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; - GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect ); - switch (res) - { - case GDK_OVERLAP_RECTANGLE_IN: return wxInRegion; - case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion; - case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion; - } - return wxOutRegion; + if (!m_refData) + return wxOutRegion; + + if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) + return wxInRegion; + else + return wxOutRegion; +} + +wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const +{ + if (!m_refData) + return wxOutRegion; + + GdkRectangle rect; + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; + GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect ); + switch (res) + { + case GDK_OVERLAP_RECTANGLE_IN: return wxInRegion; + case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion; + case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion; + } + return wxOutRegion; } wxRegionContain wxRegion::Contains(const wxPoint& pt) const { - return Contains( pt.x, pt.y ); + return Contains( pt.x, pt.y ); } wxRegionContain wxRegion::Contains(const wxRect& rect) const { - return Contains( rect.x, rect.y, rect.width, rect.height ); + return Contains( rect.x, rect.y, rect.width, rect.height ); } -GdkRegion *wxRegion::GetRegion(void) const +GdkRegion *wxRegion::GetRegion() const { - return M_REGIONDATA->m_region; + if (!m_refData) + return (GdkRegion*) NULL; + + return M_REGIONDATA->m_region; } wxList *wxRegion::GetRectList() const { - return &(M_REGIONDATA->m_rects); + if (!m_refData) + return (wxList*) NULL; + + return &(M_REGIONDATA->m_rects); } //----------------------------------------------------------------------------- @@ -361,74 +413,73 @@ wxList *wxRegion::GetRectList() const //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - -wxRegionIterator::wxRegionIterator(void) + +wxRegionIterator::wxRegionIterator() { - m_current = 0; + Reset(); } wxRegionIterator::wxRegionIterator( const wxRegion& region ) { - m_region = region; - m_current = 0; + Reset(region); } void wxRegionIterator::Reset( const wxRegion& region ) { - m_region = region; - m_current = 0; + m_region = region; + Reset(); } -wxRegionIterator::operator bool (void) const -{ - return m_current < m_region.GetRectList()->Number(); +wxRegionIterator::operator bool () const +{ + return m_current < (size_t)m_region.GetRectList()->Number(); } -bool wxRegionIterator::HaveRects(void) const -{ - return m_current < m_region.GetRectList()->Number(); +bool wxRegionIterator::HaveRects() const +{ + return m_current < (size_t)m_region.GetRectList()->Number(); } -void wxRegionIterator::operator ++ (void) +void wxRegionIterator::operator ++ () { - if (m_current < m_region.GetRectList()->Number()) ++m_current; + if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current; } void wxRegionIterator::operator ++ (int) { - if (m_current < m_region.GetRectList()->Number()) ++m_current; + if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current; } -long wxRegionIterator::GetX(void) const +wxCoord wxRegionIterator::GetX() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->x; + wxNode *node = m_region.GetRectList()->Nth( m_current ); + if (!node) return 0; + wxRect *r = (wxRect*)node->Data(); + return r->x; } -long wxRegionIterator::GetY(void) const +wxCoord wxRegionIterator::GetY() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->y; + wxNode *node = m_region.GetRectList()->Nth( m_current ); + if (!node) return 0; + wxRect *r = (wxRect*)node->Data(); + return r->y; } -long wxRegionIterator::GetW(void) const +wxCoord wxRegionIterator::GetW() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->width; + wxNode *node = m_region.GetRectList()->Nth( m_current ); + if (!node) return 0; + wxRect *r = (wxRect*)node->Data(); + return r->width; } -long wxRegionIterator::GetH(void) const +wxCoord wxRegionIterator::GetH() const { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->height; + wxNode *node = m_region.GetRectList()->Nth( m_current ); + if (!node) return 0; + wxRect *r = (wxRect*)node->Data(); + return r->height; }