X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48850fa74dee8ace36f70059f1938488c4196a97..7198c3368055d88249a338eb33b21f051f674806:/src/gtk1/region.cpp diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 2159fea32e..bc33b74551 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/region.cpp +// Name: src/gtk1/region.cpp // Purpose: // Author: Robert Roebling // Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed @@ -12,46 +12,58 @@ // declarations // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "region.h" -#endif - // ---------------------------------------------------------------------------- // 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 + +#include "wx/gtk1/private.h" + + +// ---------------------------------------------------------------------------- +// wxGdkRegion: creates a new region in ctor and destroys in dtor +// ---------------------------------------------------------------------------- + +class wxGdkRegion +{ +public: + wxGdkRegion() { m_region = gdk_region_new(); } + ~wxGdkRegion() { gdk_region_destroy(m_region); } + + operator GdkRegion *() const { return m_region; } + +private: + GdkRegion *m_region; +}; -#include "wx/log.h" // ---------------------------------------------------------------------------- // wxRegionRefData: private class containing the information about the region // ---------------------------------------------------------------------------- -class wxRegionRefData : public wxObjectRefData +class wxRegionRefData : public wxGDIRefData { public: wxRegionRefData() { m_region = NULL; } - + wxRegionRefData(const wxRegionRefData& refData) + : wxGDIRefData() { -#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 + m_region = gdk_regions_union(wxGdkRegion(), refData.m_region); } - - ~wxRegionRefData() + + virtual ~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); @@ -67,8 +79,8 @@ public: #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); +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) // ---------------------------------------------------------------------------- // wxRegion construction @@ -83,19 +95,19 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) rect.y = y; rect.width = w; rect.height = h; - + m_refData = new wxRegionRefData(); - -#ifdef __WXGTK20__ - M_REGIONDATA->m_region = gdk_region_rectangle( rect ); -#else - GdkRegion *reg = gdk_region_new(); - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); -#endif + + M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect ); +} + +wxRegion::wxRegion( GdkRegion *region ) +{ + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region); } -wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) +wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle ) { GdkPoint *gdkpoints = new GdkPoint[n]; for ( size_t i = 0 ; i < n ; i++ ) @@ -124,31 +136,26 @@ wxRegion::~wxRegion() // m_refData unrefed in ~wxObject } -wxObjectRefData *wxRegion::CreateRefData() const +wxGDIRefData *wxRegion::CreateGDIRefData() const { return new wxRegionRefData; } -wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { return new wxRegionRefData(*(wxRegionRefData *)data); } + // ---------------------------------------------------------------------------- // wxRegion comparison // ---------------------------------------------------------------------------- -bool wxRegion::operator==( const wxRegion& region ) +bool wxRegion::DoIsEqual(const wxRegion& region) const { - // 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 !(*this == region); -} - // ---------------------------------------------------------------------------- // wxRegion operations // ---------------------------------------------------------------------------- @@ -158,47 +165,37 @@ void wxRegion::Clear() UnRef(); } -bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::DoUnionWithRect(const wxRect& r) { - GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height; - - if (!m_refData) + // 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 ) { - m_refData = new wxRegionRefData(); -#ifdef __WXGTK20__ - M_REGIONDATA->m_region = gdk_region_rectangle( rect ); -#else - GdkRegion *reg = gdk_region_new(); - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); -#endif + InitRect(r.x, r.y, r.width, r.height); } else { AllocExclusive(); -#ifdef __WXGTK20__ - gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); -#else + GdkRectangle rect; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.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; -#endif } return TRUE; } -bool wxRegion::Union( const wxRect& rect ) -{ - return Union( rect.x, rect.y, rect.width, rect.height ); -} - -bool wxRegion::Union( const wxRegion& region ) +bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { if (region.IsNull()) return FALSE; @@ -213,132 +210,77 @@ bool wxRegion::Union( const wxRegion& region ) AllocExclusive(); } -#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 return TRUE; } -bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - - return Intersect( reg ); -} - -bool wxRegion::Intersect( const wxRect& rect ) -{ - wxRegion reg( rect ); - - return Intersect( reg ); -} - -bool wxRegion::Intersect( const wxRegion& region ) +bool wxRegion::DoIntersect( const wxRegion& region ) { - if (region.IsNull()) - return FALSE; + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - - // leave here - return TRUE; - } - else - { - AllocExclusive(); + // intersecting with invalid region doesn't make sense + return FALSE; } -#ifdef __WXGTK20__ - gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); -#else + AllocExclusive(); + 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; } -bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - return Subtract( reg ); -} - -bool wxRegion::Subtract( const wxRect& rect ) +bool wxRegion::DoSubtract( const wxRegion& region ) { - wxRegion reg( rect ); - return Subtract( reg ); -} - -bool wxRegion::Subtract( const wxRegion& region ) -{ - if (region.IsNull()) - return FALSE; + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - else - { - AllocExclusive(); + // subtracting from an invalid region doesn't make sense + return FALSE; } -#ifdef __WXGTK20__ - gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); -#else + AllocExclusive(); + 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; } -bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - return Xor( reg ); -} - -bool wxRegion::Xor( const wxRect& rect ) +bool wxRegion::DoXor( const wxRegion& region ) { - wxRegion reg( rect ); - return Xor( reg ); -} - -bool wxRegion::Xor( const wxRegion& region ) -{ - if (region.IsNull()) - return FALSE; + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - else - { - AllocExclusive(); + return FALSE; } -#ifdef __WXGTK20__ - gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); -#else + AllocExclusive(); + GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_destroy( M_REGIONDATA->m_region ); M_REGIONDATA->m_region = reg; -#endif + + return TRUE; +} + +bool wxRegion::DoOffset( wxCoord x, wxCoord y ) +{ + if (!m_refData) + return FALSE; + + AllocExclusive(); + + gdk_region_offset( M_REGIONDATA->m_region, x, y ); return TRUE; } @@ -347,7 +289,7 @@ bool wxRegion::Xor( const wxRegion& region ) // wxRegion tests // ---------------------------------------------------------------------------- -void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const +bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const { if ( m_refData ) { @@ -357,6 +299,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const y = rect.y; w = rect.width; h = rect.height; + + return true; } else { @@ -364,29 +308,12 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const y = 0; w = -1; h = -1; - } -} -wxRect wxRegion::GetBox() const -{ - wxCoord x, y, w, h; - GetBox( x, y, w, h ); - return wxRect( x, y, w, h ); -} - -bool wxRegion::Offset( wxCoord x, wxCoord y ) -{ - if (!m_refData) - return FALSE; - - AllocExclusive(); - - gdk_region_offset( M_REGIONDATA->m_region, x, y ); - - return TRUE; + return false; + } } -bool wxRegion::Empty() const +bool wxRegion::IsEmpty() const { if (!m_refData) return TRUE; @@ -394,7 +321,7 @@ bool wxRegion::Empty() const return gdk_region_empty( M_REGIONDATA->m_region ); } -wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { if (!m_refData) return wxOutRegion; @@ -405,16 +332,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const return wxOutRegion; } -wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord 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) { @@ -425,20 +352,10 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) return wxOutRegion; } -wxRegionContain wxRegion::Contains(const wxPoint& pt) const -{ - return Contains( pt.x, pt.y ); -} - -wxRegionContain wxRegion::Contains(const wxRect& rect) const -{ - return Contains( rect.x, rect.y, rect.width, rect.height ); -} - GdkRegion *wxRegion::GetRegion() const { if (!m_refData) - return (GdkRegion*) NULL; + return NULL; return M_REGIONDATA->m_region; } @@ -447,8 +364,6 @@ GdkRegion *wxRegion::GetRegion() const // wxRegionIterator // ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - // the following structures must match the private structures // in X11 region code ( xc/lib/X11/region.h ) @@ -466,58 +381,36 @@ struct _XRegion { _XBox *rects, extents; }; -#endif -class wxRIRefData: public wxObjectRefData +class wxRIRefData : public wxGDIRefData { public: + wxRIRefData() { Init(); } + virtual ~wxRIRefData(); - wxRIRefData() : m_rects(0), m_numRects(0){} - ~wxRIRefData(); + void CreateRects( const wxRegion& r ); + + void Init() { m_rects = NULL; m_numRects = 0; } wxRect *m_rects; size_t m_numRects; - - void CreateRects( const wxRegion& r ); }; wxRIRefData::~wxRIRefData() { - delete m_rects; + delete [] m_rects; } void wxRIRefData::CreateRects( const wxRegion& region ) { - if (m_rects) - delete m_rects; + delete [] m_rects; + + Init(); - m_rects = 0; - m_numRects = 0; - GdkRegion *gdkregion = region.GetRegion(); - if (!gdkregion) return; - -#ifdef __WXGTK20__ - GdkRectangles *gdkrects = NULL; - gint numRects = 0; - gdk_region_get_rectangles( gdkregion, &gdkrect, &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_delete( gdkrects ); // delete [] -#else + if (!gdkregion) + return; + Region r = ((GdkRegionPrivate *)gdkregion)->xregion; if (r) { @@ -536,7 +429,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } } -#endif } wxRegionIterator::wxRegionIterator() @@ -563,42 +455,48 @@ bool wxRegionIterator::HaveRects() const return m_current < ((wxRIRefData*)m_refData)->m_numRects; } -wxRegionIterator::operator bool () const +wxRegionIterator& wxRegionIterator::operator ++ () { - return HaveRects(); -} + if (HaveRects()) + ++m_current; -void wxRegionIterator::operator ++ () -{ - if (HaveRects()) ++m_current; + return *this; } -void wxRegionIterator::operator ++ (int) +wxRegionIterator wxRegionIterator::operator ++ (int) { - if (HaveRects()) ++m_current; + wxRegionIterator tmp = *this; + if (HaveRects()) + ++m_current; + + return tmp; } wxCoord wxRegionIterator::GetX() const { - if( !HaveRects() ) return 0; + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { - if( !HaveRects() ) return 0; + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { - if( !HaveRects() ) return -1; + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { - if( !HaveRects() ) return -1; + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].height; } @@ -610,4 +508,3 @@ wxRect wxRegionIterator::GetRect() const return r; } -