// headers
// ----------------------------------------------------------------------------
-#include "wx/region.h"
+#include "wx/log.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/region.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/gtk/private.h"
-#include "wx/log.h"
+#ifndef __WXGTK20__
// ----------------------------------------------------------------------------
-// wxRegionRefData: private class containing the information about the region
+// wxGdkRegion: creates a new region in ctor and destroys in dtor
// ----------------------------------------------------------------------------
-class wxRegionRefData : public wxObjectRefData
+class wxGdkRegion
{
public:
- wxRegionRefData();
- wxRegionRefData(const wxRegionRefData& refData);
- virtual ~wxRegionRefData();
-
- GdkRegion *m_region;
-#if OLDCODE
- wxList m_rects;
-#endif
-};
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
+ wxGdkRegion() { m_region = gdk_region_new(); }
+ ~wxGdkRegion() { gdk_region_destroy(m_region); }
-#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
+ operator GdkRegion *() const { return m_region; }
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+private:
+ GdkRegion *m_region;
+};
-// ============================================================================
-// implementation
-// ============================================================================
+#endif // __WXGTK20__
// ----------------------------------------------------------------------------
-// wxRegionRefData
+// wxRegionRefData: private class containing the information about the region
// ----------------------------------------------------------------------------
-wxRegionRefData::wxRegionRefData()
+class wxRegionRefData : public wxObjectRefData
{
- m_region = (GdkRegion *) NULL;
-}
+public:
+ wxRegionRefData()
+ {
+ m_region = NULL;
+ }
-wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData)
-{
+ wxRegionRefData(const wxRegionRefData& refData)
+ : wxObjectRefData()
+ {
#ifdef __WXGTK20__
- m_region = gdk_region_copy(refData.m_region);
+ 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;
+ m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
#endif
+ }
-#if OLDCODE
- wxNode *node = refData.m_rects.First();
- while (node)
+ ~wxRegionRefData()
{
- wxRect *r = (wxRect*)node->Data();
- m_rects.Append( (wxObject*) new wxRect(*r) );
- node = node->Next();
+ if (m_region)
+ gdk_region_destroy( m_region );
}
-#endif
-}
-wxRegionRefData::~wxRegionRefData()
-{
- if (m_region)
- gdk_region_destroy( m_region );
+ GdkRegion *m_region;
+};
-#if OLDCODE
- wxNode *node = m_rects.First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- delete r;
- node = node->Next();
- }
-#endif
-}
+// ----------------------------------------------------------------------------
+// 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)
// ----------------------------------------------------------------------------
// wxRegion construction
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-wxRegion::wxRegion()
-{
-}
-
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_refData = new wxRegionRefData();
+
#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 );
+ M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect );
#endif
+}
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x, y, w, h) );
+wxRegion::wxRegion( GdkRegion *region )
+{
+ m_refData = new wxRegionRefData();
+#ifdef __WXGTK20__
+ M_REGIONDATA->m_region = gdk_region_copy( region );
+#else
+ M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);
#endif
}
wxRegion::~wxRegion()
{
+ // m_refData unrefed in ~wxObject
+}
+
+wxObjectRefData *wxRegion::CreateRefData() const
+{
+ return new wxRegionRefData;
+}
+
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+{
+ return new wxRegionRefData(*(wxRegionRefData *)data);
}
// ----------------------------------------------------------------------------
bool wxRegion::operator==( const wxRegion& region )
{
+ 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);
}
-bool wxRegion::operator != ( const wxRegion& region )
-{
- return !(*this == region);
-}
-
// ----------------------------------------------------------------------------
// wxRegion operations
// ----------------------------------------------------------------------------
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();
-#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
+ 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
#endif
}
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
-#endif
-
return TRUE;
}
if (region.IsNull())
return FALSE;
- AllocExclusive();
+ 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)
-{
- 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;
+ return Intersect( reg );
}
bool wxRegion::Intersect( const wxRegion& region )
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- return TRUE;
- }
-
- if ( !IntersectRegionOnly(region) )
- {
- GetRectList()->Clear();
-
+ // intersecting with invalid region doesn't make sense
return FALSE;
}
- // 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;
- }
+ AllocExclusive();
- node = node->Next();
- }
-#endif // OLDCODE
+#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;
}
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();
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
- else
- {
- AllocExclusive();
+ return FALSE;
}
+ AllocExclusive();
+
#ifdef __WXGTK20__
gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
#else
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 // OLDCODE
+ 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;
}
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)
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 // !OLDCODE
+#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 // GTK+ 1.x
+
class wxRIRefData: public wxObjectRefData
{
public:
+ wxRIRefData() { Init(); }
+ virtual ~wxRIRefData();
+
+ void CreateRects( const wxRegion& r );
- wxRIRefData() : m_rects(0), m_numRects(0){}
- ~wxRIRefData();
+ 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;
}
-#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 )
+ delete [] m_rects;
+
+ 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)
+ {
+ 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)
{
- _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;
+ 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 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, _T("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
}
wxCoord wxRegionIterator::GetY() const
{
- if( !HaveRects() ) return 0;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
}
wxCoord wxRegionIterator::GetW() const
{
- if( !HaveRects() ) return -1;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
}
wxCoord wxRegionIterator::GetH() const
{
- if( !HaveRects() ) return -1;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
}
return r;
}
-#endif // OLDCODE/!OLDCODE
-
projects / wxWidgets.git / blobdiff