Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Big wxRegion clean up.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-02-04 12:04:23 +00:00
parent e0f0b19775
commit 48850fa74d
4 changed files with 208 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/region.h
View File

@@ -111,7 +111,6 @@ public:
wxRegionContain Contains(const wxRect& rect) const; wxRegionContain Contains(const wxRect& rect) const;
public: public:
wxList *GetRectList() const;
GdkRegion *GetRegion() const; GdkRegion *GetRegion() const;
protected: protected:
@@ -122,9 +121,6 @@ protected:
// common part of ctors for a rectangle region // common part of ctors for a rectangle region
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
// helper of Intersect()
bool IntersectRegionOnly(const wxRegion& reg);
private: private:
DECLARE_DYNAMIC_CLASS(wxRegion); DECLARE_DYNAMIC_CLASS(wxRegion);
}; };

4
include/wx/gtk1/region.h
View File

@@ -111,7 +111,6 @@ public:
wxRegionContain Contains(const wxRect& rect) const; wxRegionContain Contains(const wxRect& rect) const;
public: public:
wxList *GetRectList() const;
GdkRegion *GetRegion() const; GdkRegion *GetRegion() const;
protected: protected:
@@ -122,9 +121,6 @@ protected:
// common part of ctors for a rectangle region // common part of ctors for a rectangle region
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
// helper of Intersect()
bool IntersectRegionOnly(const wxRegion& reg);
private: private:
DECLARE_DYNAMIC_CLASS(wxRegion); DECLARE_DYNAMIC_CLASS(wxRegion);
}; };

364
src/gtk/region.cpp
View File

@@ -25,15 +25,6 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
// Unfortunately the new way of implementing the region iterator
// doesn't work with GTK+ 2.0 or above (can't access a Region in
// GdkPrivateRegion)
#ifdef __WXGTK20__
#define OLDCODE 1
#else
#define OLDCODE 0
#endif
#include "wx/log.h" #include "wx/log.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -43,14 +34,30 @@
class wxRegionRefData : public wxObjectRefData class wxRegionRefData : public wxObjectRefData
{ {
public: public:
wxRegionRefData(); wxRegionRefData()
wxRegionRefData(const wxRegionRefData& refData); {
virtual ~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; GdkRegion *m_region;
#if OLDCODE
wxList m_rects;
#endif
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -63,57 +70,6 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject); IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxRegionRefData
// ----------------------------------------------------------------------------
wxRegionRefData::wxRegionRefData()
{
m_region = (GdkRegion *) NULL;
}
wxRegionRefData::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
#if OLDCODE
wxNode *node = refData.m_rects.First();
while (node)
{
wxRect *r = (wxRect*)node->Data();
m_rects.Append( (wxObject*) new wxRect(*r) );
node = node->Next();
}
#endif
}
wxRegionRefData::~wxRegionRefData()
{
if (m_region)
gdk_region_destroy( m_region );
#if OLDCODE
wxNode *node = m_rects.First();
while (node)
{
wxRect *r = (wxRect*)node->Data();
delete r;
node = node->Next();
}
#endif
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRegion construction // wxRegion construction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -122,24 +78,21 @@ wxRegionRefData::~wxRegionRefData()
void wxRegion::InitRect(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; GdkRectangle rect;
rect.x = x; rect.x = x;
rect.y = y; rect.y = y;
rect.width = w; rect.width = w;
rect.height = h; rect.height = h;
m_refData = new wxRegionRefData();
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_rectangle( rect );
M_REGIONDATA->m_region = reg;
#else #else
GdkRegion *reg = gdk_region_new();
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif #endif
#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x, y, w, h) );
#endif
} }
wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
@@ -216,11 +169,10 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
if (!m_refData) if (!m_refData)
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new();
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_rectangle( rect );
M_REGIONDATA->m_region = reg;
#else #else
GdkRegion *reg = gdk_region_new();
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif #endif
@@ -238,10 +190,6 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
#endif #endif
} }
#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
#endif
return TRUE; return TRUE;
} }
@@ -255,7 +203,15 @@ bool wxRegion::Union( const wxRegion& region )
if (region.IsNull()) if (region.IsNull())
return FALSE; return FALSE;
AllocExclusive(); if (!m_refData)
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
else
{
AllocExclusive();
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
@@ -265,16 +221,6 @@ bool wxRegion::Union( const wxRegion& region )
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif #endif
#if OLDCODE
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; return TRUE;
} }
@@ -292,25 +238,6 @@ bool wxRegion::Intersect( const wxRect& rect )
return Intersect( reg ); return Intersect( reg );
} }
// this helper function just computes the region intersection without updating
// the list of rectangles each region maintaints: this allows us to call it
// from Intersect() itself without going into infinite recursion as we would
// if we called Intersect() itself recursively
bool wxRegion::IntersectRegionOnly(const wxRegion& region)
{
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::Intersect( const wxRegion& region ) bool wxRegion::Intersect( const wxRegion& region )
{ {
if (region.IsNull()) if (region.IsNull())
@@ -320,40 +247,22 @@ bool wxRegion::Intersect( const wxRegion& region )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
// leave here
return TRUE; return TRUE;
} }
else
if ( !IntersectRegionOnly(region) )
{ {
GetRectList()->Clear(); AllocExclusive();
return FALSE;
} }
// we need to update the rect list as well #ifdef __WXGTK20__
#if OLDCODE gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
wxList& list = *GetRectList(); #else
wxNode *node = list.First(); GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
while (node) gdk_region_destroy( M_REGIONDATA->m_region );
{ M_REGIONDATA->m_region = reg;
wxRect *r = (wxRect*)node->Data(); #endif
wxRegion regCopy = region;
if ( regCopy.IntersectRegionOnly(*r) )
{
// replace the node with the intersection
*r = regCopy.GetBox();
}
else
{
// TODO remove the rect from the list
r->width = 0;
r->height = 0;
}
node = node->Next();
}
#endif // OLDCODE
return TRUE; return TRUE;
} }
@@ -380,8 +289,10 @@ bool wxRegion::Subtract( const wxRegion& region )
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
else
AllocExclusive(); {
AllocExclusive();
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
@@ -429,16 +340,6 @@ bool wxRegion::Xor( const wxRegion& region )
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif #endif
#if OLDCODE
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 // OLDCODE
return TRUE; return TRUE;
} }
@@ -542,93 +443,11 @@ GdkRegion *wxRegion::GetRegion() const
return M_REGIONDATA->m_region; return M_REGIONDATA->m_region;
} }
wxList *wxRegion::GetRectList() const
{
#if OLDCODE
if (!m_refData)
return (wxList*) NULL;
return &(M_REGIONDATA->m_rects);
#else
return (wxList*) NULL;
#endif
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRegionIterator // wxRegionIterator
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if OLDCODE #ifndef __WXGTK20__
wxRegionIterator::wxRegionIterator()
{
Reset();
}
wxRegionIterator::wxRegionIterator( const wxRegion& region )
{
Reset(region);
}
void wxRegionIterator::Reset( const wxRegion& region )
{
m_region = region;
Reset();
}
wxRegionIterator::operator bool () const
{
return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
if (HaveRects()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
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;
}
wxCoord wxRegionIterator::GetY() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
wxRect *r = (wxRect*)node->Data();
return r->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;
}
wxCoord wxRegionIterator::GetH() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
wxRect *r = (wxRect*)node->Data();
return r->height;
}
#else // !OLDCODE
// the following structures must match the private structures // the following structures must match the private structures
// in X11 region code ( xc/lib/X11/region.h ) // in X11 region code ( xc/lib/X11/region.h )
@@ -636,6 +455,8 @@ wxCoord wxRegionIterator::GetH() const
// this makes the Region type transparent // this makes the Region type transparent
// and we have access to the region rectangles // and we have access to the region rectangles
#include <gdk/gdkprivate.h>
struct _XBox { struct _XBox {
short x1, x2, y1, y2; short x1, x2, y1, y2;
}; };
@@ -645,6 +466,8 @@ struct _XRegion {
_XBox *rects, extents; _XBox *rects, extents;
}; };
#endif
class wxRIRefData: public wxObjectRefData class wxRIRefData: public wxObjectRefData
{ {
public: public:
@@ -663,34 +486,57 @@ wxRIRefData::~wxRIRefData()
delete m_rects; delete m_rects;
} }
#include <gdk/gdkprivate.h>
void wxRIRefData::CreateRects( const wxRegion& region ) void wxRIRefData::CreateRects( const wxRegion& region )
{ {
if( m_rects ) if (m_rects)
delete m_rects; delete m_rects;
m_rects = 0;
m_numRects= 0; m_rects = 0;
GdkRegion *gdkregion= region.GetRegion(); m_numRects = 0;
if( gdkregion ){
Region r= ((GdkRegionPrivate *)gdkregion)->xregion; GdkRegion *gdkregion = region.GetRegion();
if( r ){ if (!gdkregion) return;
m_numRects= r->numRects;
if( m_numRects ) #ifdef __WXGTK20__
{ GdkRectangles *gdkrects = NULL;
m_rects= new wxRect[m_numRects]; gint numRects = 0;
for( size_t i=0; i<m_numRects; ++i ) 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)
{ {
_XBox &xr= r->rects[i]; GdkRectangle &gr = gdkrects[i];
wxRect&wr= m_rects[i]; wxRect &wr = m_rects[i];
wr.x = xr.x1; wr.x = gr.x;
wr.y = xr.y1; wr.y = gr.y;
wr.width = xr.x2-xr.x1; wr.width = gr.width;
wr.height= xr.y2-xr.y1; wr.height = gr.height;
} }
}
} }
} g_delete( gdkrects ); // delete []
#else
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
} }
wxRegionIterator::wxRegionIterator() wxRegionIterator::wxRegionIterator()
@@ -765,5 +611,3 @@ wxRect wxRegionIterator::GetRect() const
return r; return r;
} }
#endif // OLDCODE/!OLDCODE

364
src/gtk1/region.cpp
View File

@@ -25,15 +25,6 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
// Unfortunately the new way of implementing the region iterator
// doesn't work with GTK+ 2.0 or above (can't access a Region in
// GdkPrivateRegion)
#ifdef __WXGTK20__
#define OLDCODE 1
#else
#define OLDCODE 0
#endif
#include "wx/log.h" #include "wx/log.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -43,14 +34,30 @@
class wxRegionRefData : public wxObjectRefData class wxRegionRefData : public wxObjectRefData
{ {
public: public:
wxRegionRefData(); wxRegionRefData()
wxRegionRefData(const wxRegionRefData& refData); {
virtual ~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; GdkRegion *m_region;
#if OLDCODE
wxList m_rects;
#endif
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -63,57 +70,6 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject); IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxRegionRefData
// ----------------------------------------------------------------------------
wxRegionRefData::wxRegionRefData()
{
m_region = (GdkRegion *) NULL;
}
wxRegionRefData::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
#if OLDCODE
wxNode *node = refData.m_rects.First();
while (node)
{
wxRect *r = (wxRect*)node->Data();
m_rects.Append( (wxObject*) new wxRect(*r) );
node = node->Next();
}
#endif
}
wxRegionRefData::~wxRegionRefData()
{
if (m_region)
gdk_region_destroy( m_region );
#if OLDCODE
wxNode *node = m_rects.First();
while (node)
{
wxRect *r = (wxRect*)node->Data();
delete r;
node = node->Next();
}
#endif
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRegion construction // wxRegion construction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -122,24 +78,21 @@ wxRegionRefData::~wxRegionRefData()
void wxRegion::InitRect(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; GdkRectangle rect;
rect.x = x; rect.x = x;
rect.y = y; rect.y = y;
rect.width = w; rect.width = w;
rect.height = h; rect.height = h;
m_refData = new wxRegionRefData();
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_rectangle( rect );
M_REGIONDATA->m_region = reg;
#else #else
GdkRegion *reg = gdk_region_new();
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif #endif
#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x, y, w, h) );
#endif
} }
wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
@@ -216,11 +169,10 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
if (!m_refData) if (!m_refData)
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new();
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_rectangle( rect );
M_REGIONDATA->m_region = reg;
#else #else
GdkRegion *reg = gdk_region_new();
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif #endif
@@ -238,10 +190,6 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
#endif #endif
} }
#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
#endif
return TRUE; return TRUE;
} }
@@ -255,7 +203,15 @@ bool wxRegion::Union( const wxRegion& region )
if (region.IsNull()) if (region.IsNull())
return FALSE; return FALSE;
AllocExclusive(); if (!m_refData)
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
else
{
AllocExclusive();
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
@@ -265,16 +221,6 @@ bool wxRegion::Union( const wxRegion& region )
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif #endif
#if OLDCODE
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; return TRUE;
} }
@@ -292,25 +238,6 @@ bool wxRegion::Intersect( const wxRect& rect )
return Intersect( reg ); return Intersect( reg );
} }
// this helper function just computes the region intersection without updating
// the list of rectangles each region maintaints: this allows us to call it
// from Intersect() itself without going into infinite recursion as we would
// if we called Intersect() itself recursively
bool wxRegion::IntersectRegionOnly(const wxRegion& region)
{
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::Intersect( const wxRegion& region ) bool wxRegion::Intersect( const wxRegion& region )
{ {
if (region.IsNull()) if (region.IsNull())
@@ -320,40 +247,22 @@ bool wxRegion::Intersect( const wxRegion& region )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
// leave here
return TRUE; return TRUE;
} }
else
if ( !IntersectRegionOnly(region) )
{ {
GetRectList()->Clear(); AllocExclusive();
return FALSE;
} }
// we need to update the rect list as well #ifdef __WXGTK20__
#if OLDCODE gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
wxList& list = *GetRectList(); #else
wxNode *node = list.First(); GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
while (node) gdk_region_destroy( M_REGIONDATA->m_region );
{ M_REGIONDATA->m_region = reg;
wxRect *r = (wxRect*)node->Data(); #endif
wxRegion regCopy = region;
if ( regCopy.IntersectRegionOnly(*r) )
{
// replace the node with the intersection
*r = regCopy.GetBox();
}
else
{
// TODO remove the rect from the list
r->width = 0;
r->height = 0;
}
node = node->Next();
}
#endif // OLDCODE
return TRUE; return TRUE;
} }
@@ -380,8 +289,10 @@ bool wxRegion::Subtract( const wxRegion& region )
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
else
AllocExclusive(); {
AllocExclusive();
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
@@ -429,16 +340,6 @@ bool wxRegion::Xor( const wxRegion& region )
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif #endif
#if OLDCODE
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 // OLDCODE
return TRUE; return TRUE;
} }
@@ -542,93 +443,11 @@ GdkRegion *wxRegion::GetRegion() const
return M_REGIONDATA->m_region; return M_REGIONDATA->m_region;
} }
wxList *wxRegion::GetRectList() const
{
#if OLDCODE
if (!m_refData)
return (wxList*) NULL;
return &(M_REGIONDATA->m_rects);
#else
return (wxList*) NULL;
#endif
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRegionIterator // wxRegionIterator
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if OLDCODE #ifndef __WXGTK20__
wxRegionIterator::wxRegionIterator()
{
Reset();
}
wxRegionIterator::wxRegionIterator( const wxRegion& region )
{
Reset(region);
}
void wxRegionIterator::Reset( const wxRegion& region )
{
m_region = region;
Reset();
}
wxRegionIterator::operator bool () const
{
return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
if (HaveRects()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
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;
}
wxCoord wxRegionIterator::GetY() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
wxRect *r = (wxRect*)node->Data();
return r->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;
}
wxCoord wxRegionIterator::GetH() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
wxRect *r = (wxRect*)node->Data();
return r->height;
}
#else // !OLDCODE
// the following structures must match the private structures // the following structures must match the private structures
// in X11 region code ( xc/lib/X11/region.h ) // in X11 region code ( xc/lib/X11/region.h )
@@ -636,6 +455,8 @@ wxCoord wxRegionIterator::GetH() const
// this makes the Region type transparent // this makes the Region type transparent
// and we have access to the region rectangles // and we have access to the region rectangles
#include <gdk/gdkprivate.h>
struct _XBox { struct _XBox {
short x1, x2, y1, y2; short x1, x2, y1, y2;
}; };
@@ -645,6 +466,8 @@ struct _XRegion {
_XBox *rects, extents; _XBox *rects, extents;
}; };
#endif
class wxRIRefData: public wxObjectRefData class wxRIRefData: public wxObjectRefData
{ {
public: public:
@@ -663,34 +486,57 @@ wxRIRefData::~wxRIRefData()
delete m_rects; delete m_rects;
} }
#include <gdk/gdkprivate.h>
void wxRIRefData::CreateRects( const wxRegion& region ) void wxRIRefData::CreateRects( const wxRegion& region )
{ {
if( m_rects ) if (m_rects)
delete m_rects; delete m_rects;
m_rects = 0;
m_numRects= 0; m_rects = 0;
GdkRegion *gdkregion= region.GetRegion(); m_numRects = 0;
if( gdkregion ){
Region r= ((GdkRegionPrivate *)gdkregion)->xregion; GdkRegion *gdkregion = region.GetRegion();
if( r ){ if (!gdkregion) return;
m_numRects= r->numRects;
if( m_numRects ) #ifdef __WXGTK20__
{ GdkRectangles *gdkrects = NULL;
m_rects= new wxRect[m_numRects]; gint numRects = 0;
for( size_t i=0; i<m_numRects; ++i ) 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)
{ {
_XBox &xr= r->rects[i]; GdkRectangle &gr = gdkrects[i];
wxRect&wr= m_rects[i]; wxRect &wr = m_rects[i];
wr.x = xr.x1; wr.x = gr.x;
wr.y = xr.y1; wr.y = gr.y;
wr.width = xr.x2-xr.x1; wr.width = gr.width;
wr.height= xr.y2-xr.y1; wr.height = gr.height;
} }
}
} }
} g_delete( gdkrects ); // delete []
#else
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
} }
wxRegionIterator::wxRegionIterator() wxRegionIterator::wxRegionIterator()
@@ -765,5 +611,3 @@ wxRect wxRegionIterator::GetRect() const
return r; return r;
} }
#endif // OLDCODE/!OLDCODE