// Name: gtk/region.cpp
// Purpose:
// Author: Robert Roebling
-// Modified: VZ at 05.10.00: use Unshare(), comparison fixed
+// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// headers
// ----------------------------------------------------------------------------
-#include "wx/region.h"
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/log.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/region.h"
-#include "wx/log.h"
+#include "wx/gtk/private.h"
// ----------------------------------------------------------------------------
// wxRegionRefData: private class containing the information about the region
class wxRegionRefData : public wxObjectRefData
{
public:
- wxRegionRefData();
- wxRegionRefData(const wxRegionRefData& refData);
- virtual ~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;
-#if OLDCODE
- wxList m_rects;
-#endif
};
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
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
// ----------------------------------------------------------------------------
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-wxRegion::wxRegion()
-{
-}
-
-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
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
-#endif
-}
-
-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
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
-#endif
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
-#endif
-}
-
-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;
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( reg, &g_rect );
- M_REGIONDATA->m_region = reg;
-#else
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
+ M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg );
#endif
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
-#endif
}
wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
wxRegion::~wxRegion()
{
+ // m_refData unrefed in ~wxObject
}
-bool wxRegion::operator==( const wxRegion& region )
+wxObjectRefData *wxRegion::CreateRefData() const
{
- // VZ: compare the regions themselves, not the pointers to ref data!
- return gdk_region_equal(M_REGIONDATA->m_region,
- M_REGIONDATA_OF(region)->m_region);
+ return new wxRegionRefData;
}
-bool wxRegion::operator != ( const wxRegion& region )
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
{
- return !(*this == region);
+ return new wxRegionRefData(*(wxRegionRefData *)data);
}
-void wxRegion::Unshare()
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::operator==( const wxRegion& region )
{
- if ( !m_refData )
- {
- m_refData = new wxRegionRefData;
- M_REGIONDATA->m_region = gdk_region_new();
- }
- else if ( m_refData->GetRefCount() > 1 )
- {
- wxRegionRefData *refData = new wxRegionRefData(*M_REGIONDATA);
- UnRef();
- m_refData = refData;
- }
- //else: we're not shared
+ 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);
}
// ----------------------------------------------------------------------------
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
{
- Unshare();
+ AllocExclusive();
#ifdef __WXGTK20__
gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
#endif
}
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
-#endif
-
return TRUE;
}
if (region.IsNull())
return FALSE;
- Unshare();
+ if (!m_refData)
+ {
+ m_refData = new wxRegionRefData();
+ M_REGIONDATA->m_region = gdk_region_new();
+ }
+ else
+ {
+ AllocExclusive();
+ }
#ifdef __WXGTK20__
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
M_REGIONDATA->m_region = reg;
#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;
}
bool wxRegion::Intersect( const wxRect& rect )
{
wxRegion reg( rect );
+
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)
-{
- Unshare();
-
-#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 )
{
if (region.IsNull())
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
+
+ // leave here
return TRUE;
}
-
- if ( !IntersectRegionOnly(region) )
+ else
{
- GetRectList()->Clear();
-
- return FALSE;
+ AllocExclusive();
}
- // we need to update the rect list as well
-#if OLDCODE
- wxList& list = *GetRectList();
- wxNode *node = list.First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
-
- 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();
- }
+#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;
}
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
-
- Unshare();
+ else
+ {
+ AllocExclusive();
+ }
#ifdef __WXGTK20__
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
}
else
{
- Unshare();
+ AllocExclusive();
}
#ifdef __WXGTK20__
M_REGIONDATA->m_region = reg;
#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;
}
if (!m_refData)
return FALSE;
+ AllocExclusive();
+
gdk_region_offset( M_REGIONDATA->m_region, x, y );
-
+
return TRUE;
}
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
// ----------------------------------------------------------------------------
-#if OLDCODE
-
-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
+#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;
};
_XBox *rects, extents;
};
+#endif
+
class wxRIRefData: public wxObjectRefData
{
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;
}
-#include <gdk/gdkprivate.h>
-
void wxRIRefData::CreateRects( const wxRegion& region )
{
- if( m_rects )
delete m_rects;
- m_rects = 0;
- m_numRects= 0;
- GdkRegion *gdkregion= region.GetRegion();
- if( gdkregion ){
- 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 )
+
+ Init();
+
+ 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)
{
- _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;
+ 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()
return r;
}
-#endif
-