X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7c2d6ffcb6225c445bf5f8c6ed126490345b821..667e2c55eab8820efc2e7dc06611724641e9bcf3:/src/gtk1/region.cpp?ds=sidebyside diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 9cf22c23eb..f184e4d795 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -2,134 +2,156 @@ // 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 ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + #ifdef __GNUG__ -#pragma implementation "region.h" + #pragma implementation "region.h" #endif -#include "wx/region.h" +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "wx/log.h" -#include <gdk/gdk.h> -#include <gtk/gtk.h> +#include "wx/region.h" +#include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxRegionRefData: private class containing the information about the region +// ---------------------------------------------------------------------------- -class wxRegionRefData: public wxObjectRefData +class wxRegionRefData : public wxObjectRefData { public: - wxRegionRefData(); - ~wxRegionRefData(); + wxRegionRefData() + { + m_region = NULL; + } + + wxRegionRefData(const wxRegionRefData& refData) + { +#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 + } + + ~wxRegionRefData() + { + if (m_region) + gdk_region_destroy( m_region ); + } GdkRegion *m_region; - wxList m_rects; }; -wxRegionRefData::wxRegionRefData() -{ - m_region = (GdkRegion *) NULL; -} +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- -wxRegionRefData::~wxRegionRefData() -{ - if (m_region) gdk_region_destroy( m_region ); +#define M_REGIONDATA ((wxRegionRefData *)m_refData) +#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) - wxNode *node = m_rects.First(); - while (node) - { - wxRect *r = (wxRect*)node->Data(); - delete r; - node = node->Next(); - } -} +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( 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; -#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 - 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; + #ifdef __WXGTK20__ - gdk_region_union_with_rect( reg, &rect ); - M_REGIONDATA->m_region = reg; + 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_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) ); } -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; -#ifdef __WXGTK20__ - gdk_region_union_with_rect( reg, &g_rect ); + + GdkRegion* reg = gdk_region_polygon + ( + gdkpoints, + n, + fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE + : GDK_EVEN_ODD_RULE + ); + M_REGIONDATA->m_region = reg; -#else - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect ); - gdk_region_destroy( reg ); -#endif - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); + + 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(); @@ -142,20 +164,22 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) rect.y = y; rect.width = width; rect.height = height; + if (!m_refData) { m_refData = new wxRegionRefData(); - GdkRegion *reg = gdk_region_new(); #ifdef __WXGTK20__ - gdk_region_union_with_rect( reg, &rect ); - M_REGIONDATA->m_region = reg; + 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 } else { + AllocExclusive(); + #ifdef __WXGTK20__ gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); #else @@ -164,8 +188,6 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) M_REGIONDATA->m_region = reg; #endif } - - M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); return TRUE; } @@ -185,6 +207,10 @@ 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() ); @@ -194,41 +220,21 @@ bool wxRegion::Union( const wxRegion& 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::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 ) @@ -240,9 +246,15 @@ bool wxRegion::Intersect( const wxRegion& region ) { m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); + + // leave here return TRUE; } - + else + { + AllocExclusive(); + } + #ifdef __WXGTK20__ gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); #else @@ -250,33 +262,20 @@ bool wxRegion::Intersect( const wxRegion& region ) 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 ) @@ -289,6 +288,10 @@ bool wxRegion::Subtract( const wxRegion& region ) m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); } + else + { + AllocExclusive(); + } #ifdef __WXGTK20__ gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); @@ -297,33 +300,20 @@ bool wxRegion::Subtract( const wxRegion& region ) 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 ) @@ -336,6 +326,10 @@ bool wxRegion::Xor( const wxRegion& region ) m_refData = new wxRegionRefData(); M_REGIONDATA->m_region = gdk_region_new(); } + else + { + AllocExclusive(); + } #ifdef __WXGTK20__ gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); @@ -345,44 +339,52 @@ bool wxRegion::Xor( const wxRegion& 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; } +// ---------------------------------------------------------------------------- +// 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 ); } +bool wxRegion::Offset( wxCoord x, wxCoord y ) +{ + if (!m_refData) + return FALSE; + + AllocExclusive(); + + gdk_region_offset( M_REGIONDATA->m_region, x, y ); + + return TRUE; +} + bool wxRegion::Empty() const { if (!m_refData) @@ -440,86 +442,171 @@ 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 <gdk/gdkprivate.h> + +struct _XBox { + short x1, x2, y1, y2; +}; + +struct _XRegion { + long size , numRects; + _XBox *rects, extents; +}; + +#endif + +class wxRIRefData: public wxObjectRefData { - if (!m_refData) - return (wxList*) NULL; +public: - return &(M_REGIONDATA->m_rects); + 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; } -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +void wxRIRefData::CreateRects( const wxRegion& region ) +{ + if (m_rects) + delete m_rects; -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); + m_rects = 0; + m_numRects = 0; + + GdkRegion *gdkregion = region.GetRegion(); + if (!gdkregion) return; + +#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 +bool wxRegionIterator::HaveRects() const { - return m_current < (size_t)m_region.GetRectList()->Number(); + return m_current < ((wxRIRefData*)m_refData)->m_numRects; } -bool wxRegionIterator::HaveRects() const +wxRegionIterator::operator bool () const { - return m_current < (size_t)m_region.GetRectList()->Number(); + return HaveRects(); } 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 { - wxNode *node = m_region.GetRectList()->Nth( m_current ); - if (!node) return 0; - wxRect *r = (wxRect*)node->Data(); - return r->x; + if( !HaveRects() ) return 0; + 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; + if( !HaveRects() ) return 0; + 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; + if( !HaveRects() ) return -1; + 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; + if( !HaveRects() ) return -1; + 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; +}