X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1208c3103734c8581c9854c344b97323e381897..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/gtk1/region.cpp?ds=sidebyside diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 8af2c03eee..5807eabbee 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -2,119 +2,183 @@ // Name: 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "region.h" +// ============================================================================ +// declarations +// ============================================================================ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "region.h" #endif -#include "wx/region.h" +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include -#include +#include "wx/region.h" +#include "wx/log.h" +#include "wx/gtk/private.h" +#ifndef __WXGTK20__ -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxGdkRegion: creates a new region in ctor and destroys in dtor +// ---------------------------------------------------------------------------- -class wxRegionRefData: public wxObjectRefData +class wxGdkRegion { public: - wxRegionRefData(); - ~wxRegionRefData(); + wxGdkRegion() { m_region = gdk_region_new(); } + ~wxGdkRegion() { gdk_region_destroy(m_region); } - GdkRegion *m_region; - wxList m_rects; + operator GdkRegion *() const { return m_region; } + +private: + GdkRegion *m_region; }; -wxRegionRefData::wxRegionRefData() -{ - m_region = (GdkRegion *) NULL; -} +#endif // __WXGTK20__ + +// ---------------------------------------------------------------------------- +// wxRegionRefData: private class containing the information about the region +// ---------------------------------------------------------------------------- -wxRegionRefData::~wxRegionRefData() +class wxRegionRefData : public wxObjectRefData { - if (m_region) gdk_region_destroy( m_region ); +public: + wxRegionRefData() + { + m_region = NULL; + } - wxNode *node = m_rects.First(); - while (node) + wxRegionRefData(const wxRegionRefData& refData) + : wxObjectRefData() { - wxRect *r = (wxRect*)node->Data(); - delete r; - node = node->Next(); +#ifdef __WXGTK20__ + m_region = gdk_region_copy(refData.m_region); +#else + m_region = gdk_regions_union(wxGdkRegion(), refData.m_region); +#endif } -} -//----------------------------------------------------------------------------- + ~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) -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); +// ---------------------------------------------------------------------------- +// wxRegion construction +// ---------------------------------------------------------------------------- + +#define M_REGIONDATA ((wxRegionRefData *)m_refData) -wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord 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(); + +#ifdef __WXGTK20__ + M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); +#else + M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect ); +#endif } -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) ); +#ifdef __WXGTK20__ + M_REGIONDATA->m_region = gdk_region_copy( region ); +#else + M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region); +#endif } -wxRegion::wxRegion( const wxRect& rect ) +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_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) ); + + 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() +wxRegion::~wxRegion() { + // m_refData unrefed in ~wxObject } -wxRegion::~wxRegion() +wxObjectRefData *wxRegion::CreateRefData() const { + return new wxRegionRefData; } -bool wxRegion::operator == ( const wxRegion& region ) +wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const { - return m_refData == region.m_refData; + return new wxRegionRefData(*(wxRegionRefData *)data); } -bool wxRegion::operator != ( const wxRegion& region ) +// ---------------------------------------------------------------------------- +// wxRegion comparison +// ---------------------------------------------------------------------------- + +bool wxRegion::operator==( const wxRegion& region ) { - return m_refData != region.m_refData; + if (m_refData == region.m_refData) return TRUE; + + if (!m_refData || !region.m_refData) return FALSE; + + // compare the regions themselves, not the pointers to ref data! + return gdk_region_equal(M_REGIONDATA->m_region, + M_REGIONDATA_OF(region)->m_region); } +// ---------------------------------------------------------------------------- +// wxRegion operations +// ---------------------------------------------------------------------------- + void wxRegion::Clear() { UnRef(); @@ -122,26 +186,34 @@ void wxRegion::Clear() 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; - 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 ( !width || !height ) + return TRUE; + + 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 ); + InitRect(x, y, width, height); } else { + AllocExclusive(); + + GdkRectangle rect; + rect.x = x; + rect.y = y; + rect.width = width; + rect.height = height; + +#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 } - - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); return TRUE; } @@ -161,46 +233,34 @@ bool wxRegion::Union( const wxRegion& region ) m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); } + else + { + 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; - - 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(); - } +#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 ) @@ -210,41 +270,33 @@ bool wxRegion::Intersect( const wxRegion& region ) if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - return TRUE; + // intersecting with invalid region doesn't make sense + return FALSE; } - + + AllocExclusive(); + +#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; } 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 ); - Subtract( reg ); - return TRUE; + return Subtract( reg ); } bool wxRegion::Subtract( const wxRect& rect ) { - if (!m_refData) - { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - wxRegion reg( rect ); - Subtract( reg ); - return TRUE; + return Subtract( reg ); } bool wxRegion::Subtract( const wxRegion& region ) @@ -254,91 +306,97 @@ bool wxRegion::Subtract( const wxRegion& region ) if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + // subtracting from an invalid region doesn't make sense + return FALSE; } + AllocExclusive(); + +#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; } 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 ) { if (region.IsNull()) - return NULL; + return FALSE; if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + return FALSE; } + AllocExclusive(); + +#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 - 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::Offset( wxCoord x, wxCoord y ) +{ + if (!m_refData) + return FALSE; + + AllocExclusive(); + + gdk_region_offset( M_REGIONDATA->m_region, x, y ); 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 ); } @@ -400,86 +458,177 @@ GdkRegion *wxRegion::GetRegion() const return M_REGIONDATA->m_region; } -wxList *wxRegion::GetRectList() const +// ---------------------------------------------------------------------------- +// wxRegionIterator +// ---------------------------------------------------------------------------- + +#ifndef __WXGTK20__ + +// 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 + +#include + +struct _XBox { + short x1, x2, y1, y2; +}; + +struct _XRegion { + long size , numRects; + _XBox *rects, extents; +}; + +#endif // GTK+ 1.x + +class wxRIRefData: public wxObjectRefData { - if (!m_refData) - return (wxList*) NULL; +public: + wxRIRefData() { Init(); } + virtual ~wxRIRefData(); - return &(M_REGIONDATA->m_rects); + void CreateRects( const wxRegion& r ); + + void Init() { m_rects = NULL; m_numRects = 0; } + + wxRect *m_rects; + size_t m_numRects; +}; + +wxRIRefData::~wxRIRefData() +{ + delete [] m_rects; } -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +void wxRIRefData::CreateRects( const wxRegion& region ) +{ + delete [] m_rects; + + Init(); + + GdkRegion *gdkregion = region.GetRegion(); + if (!gdkregion) + return; -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); +#ifdef __WXGTK20__ + 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 ); +#else // GTK+ 1.x + 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; i < m_numRects; ++i) + { + _XBox &xr = r->rects[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; + } + } + } +#endif // GTK+ 2.0/1.x +} 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(); } -wxRegionIterator::operator bool () const -{ - return m_current < (size_t)m_region.GetRectList()->Number(); -} - bool wxRegionIterator::HaveRects() const { - return m_current < (size_t)m_region.GetRectList()->Number(); + return m_current < ((wxRIRefData*)m_refData)->m_numRects; } -void wxRegionIterator::operator ++ () +wxRegionIterator& wxRegionIterator::operator ++ () { - if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current; + if (HaveRects()) + ++m_current; + + return *this; } -void wxRegionIterator::operator ++ (int) +wxRegionIterator wxRegionIterator::operator ++ (int) { - if (m_current < (size_t)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 ((wxRIRefData*)m_refData)->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 ((wxRIRefData*)m_refData)->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 ((wxRIRefData*)m_refData)->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 ((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; +}