X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/674ac8b919eecbc201b5f23b470a567cd0565e10..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/gtk/region.cpp

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index edb6b766d9..ce742d343b 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -16,6 +16,14 @@
 #include <gdk/gdk.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
 
 //-----------------------------------------------------------------------------
 // wxRegion
@@ -28,7 +36,9 @@ public:
     ~wxRegionRefData();
 
     GdkRegion  *m_region;
+#if OLDCODE
     wxList      m_rects;
+#endif
 };
 
 wxRegionRefData::wxRegionRefData()
@@ -40,6 +50,7 @@ wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );
 
+#if OLDCODE
     wxNode *node = m_rects.First();
     while (node)
     {
@@ -47,6 +58,7 @@ wxRegionRefData::~wxRegionRefData()
         delete r;
         node = node->Next();
     }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -64,9 +76,16 @@ wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     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 )
@@ -78,9 +97,16 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
     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;
+#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 )
@@ -92,22 +118,20 @@ wxRegion::wxRegion( const wxRect& rect )
     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 );
     gdk_region_destroy( reg );
-
-    wxNode *node = M_REGIONDATA->m_rects.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
+#if OLDCODE
+    M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
+#endif
 }
 
 wxRegion::wxRegion()
 {
-    m_refData = new wxRegionRefData();
-    M_REGIONDATA->m_region = gdk_region_new();
 }
 
 wxRegion::~wxRegion()
@@ -127,8 +151,6 @@ bool wxRegion::operator != ( const wxRegion& region )
 void wxRegion::Clear()
 {
     UnRef();
-    m_refData = new wxRegionRefData();
-    M_REGIONDATA->m_region = gdk_region_new();
 }
 
 bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
@@ -138,33 +160,61 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
     rect.y = y;
     rect.width = width;
     rect.height = height;
-    GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
-    gdk_region_destroy( M_REGIONDATA->m_region );
-    M_REGIONDATA->m_region = reg;
+    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
+    }
+    else
+    {
+#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
+    }
+    
+#if OLDCODE
     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
+#endif
+
     return TRUE;
 }
 
 bool wxRegion::Union( const wxRect& rect )
 {
-    GdkRectangle g_rect;
-    g_rect.x = rect.x;
-    g_rect.y = rect.y;
-    g_rect.width = rect.width;
-    g_rect.height = rect.height;
-    GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &g_rect );
-    gdk_region_destroy( M_REGIONDATA->m_region );
-    M_REGIONDATA->m_region = reg;
-    M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
-    return TRUE;
+    return Union( rect.x, rect.y, rect.width, rect.height );
 }
 
 bool wxRegion::Union( const wxRegion& region )
 {
+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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;
+#endif
 
+#if OLDCODE
     wxNode *node = region.GetRectList()->First();
     while (node)
     {
@@ -172,12 +222,19 @@ bool wxRegion::Union( const wxRegion& region )
         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;
@@ -185,6 +242,12 @@ bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 
 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;
@@ -192,14 +255,34 @@ bool wxRegion::Intersect( const wxRect& rect )
 
 bool wxRegion::Intersect( const wxRegion& region )
 {
+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+        return TRUE;
+    }
+    
+#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;
@@ -207,6 +290,12 @@ bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 
 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;
@@ -214,14 +303,33 @@ bool wxRegion::Subtract( const wxRect& rect )
 
 bool wxRegion::Subtract( const wxRegion& region )
 {
+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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;
@@ -229,6 +337,12 @@ bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 
 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;
@@ -236,10 +350,24 @@ bool wxRegion::Xor( const wxRect& rect )
 
 bool wxRegion::Xor( const wxRegion& region )
 {
+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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
 
+#if OLDCODE
     wxNode *node = region.GetRectList()->First();
     while (node)
     {
@@ -247,16 +375,20 @@ bool wxRegion::Xor( const wxRegion& region )
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }
+#endif
 
     return TRUE;
 }
 
-void wxRegion::GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const
+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;
@@ -277,11 +409,17 @@ wxRect wxRegion::GetBox() const
 
 bool wxRegion::Empty() const
 {
+    if (!m_refData)
+        return TRUE;
+
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
 wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
 {
+    if (!m_refData)
+        return wxOutRegion;
+
     if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
         return wxInRegion;
     else
@@ -290,6 +428,9 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
 
 wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
 {
+    if (!m_refData)
+        return wxOutRegion;
+
     GdkRectangle rect;
     rect.x = x;
     rect.y = y;
@@ -317,18 +458,30 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 
 GdkRegion *wxRegion::GetRegion() const
 {
+    if (!m_refData)
+        return (GdkRegion*) NULL;
+
     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
 }
 
 //-----------------------------------------------------------------------------
-// wxRegion
+// wxRegionIterator
 //-----------------------------------------------------------------------------
 
+#if OLDCODE
+
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
 
 wxRegionIterator::wxRegionIterator()
@@ -349,22 +502,22 @@ void wxRegionIterator::Reset( const wxRegion& region )
 
 wxRegionIterator::operator bool () const
 {
-    return m_current < (size_t)m_region.GetRectList()->Number();
+    return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
 }
 
 bool wxRegionIterator::HaveRects() const
 {
-    return m_current < (size_t)m_region.GetRectList()->Number();
+    return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
 }
 
 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
@@ -399,4 +552,135 @@ wxCoord wxRegionIterator::GetH() const
     return r->height;
 }
 
+#else
+
+// 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
+
+struct _XBox {
+    short x1, x2, y1, y2;
+};
+ 
+struct _XRegion {
+    long   size , numRects;
+    _XBox *rects, extents;
+};
+
+class wxRIRefData: public wxObjectRefData
+{
+public:
+
+    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;
+}
+
+#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 )
+        {
+          _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;
+        }
+      }
+    }
+  }
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+
+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();
+}
+
+bool wxRegionIterator::HaveRects() const
+{
+    return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+}
+
+wxRegionIterator::operator bool () const
+{
+    return HaveRects();
+}
+
+void wxRegionIterator::operator ++ ()
+{
+    if (HaveRects()) ++m_current;
+}
+
+void wxRegionIterator::operator ++ (int)
+{
+    if (HaveRects()) ++m_current;
+}
+
+wxCoord wxRegionIterator::GetX() const
+{
+    if( !HaveRects() ) return 0;
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+}
+
+wxCoord wxRegionIterator::GetY() const
+{
+    if( !HaveRects() ) return 0;
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+}
+
+wxCoord wxRegionIterator::GetW() const
+{
+    if( !HaveRects() ) return -1;
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+}
+
+wxCoord wxRegionIterator::GetH() const
+{
+    if( !HaveRects() ) return -1;
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+}
+
+#endif