X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf57d1adacf489fb1a9a2167b909b279cdf3e0f6..e5f741e5d467b1ce7105be96e9f3dcb553e8b89d:/src/gtk/region.cpp

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 3003e15b58..cb7a12beba 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        region.cpp
+// Name:        gtk/region.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -13,15 +13,10 @@
 
 #include "wx/region.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
+#define OLDCODE 0
 
 //-----------------------------------------------------------------------------
 // wxRegion
@@ -29,15 +24,14 @@
 
 class wxRegionRefData: public wxObjectRefData
 {
-  public:
-  
+public:
     wxRegionRefData();
     ~wxRegionRefData();
-  
-  public:    
 
     GdkRegion  *m_region;
+#if OLDCODE
     wxList      m_rects;
+#endif
 };
 
 wxRegionRefData::wxRegionRefData()
@@ -48,7 +42,8 @@ wxRegionRefData::wxRegionRefData()
 wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );
-  
+
+#if OLDCODE
     wxNode *node = m_rects.First();
     while (node)
     {
@@ -56,6 +51,7 @@ wxRegionRefData::~wxRegionRefData()
         delete r;
         node = node->Next();
     }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -63,8 +59,8 @@ wxRegionRefData::~wxRegionRefData()
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
-  
-wxRegion::wxRegion( long x, long y, long w, long h )
+
+wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
 {
     m_refData = new wxRegionRefData();
     GdkRegion *reg = gdk_region_new();
@@ -73,9 +69,16 @@ wxRegion::wxRegion( long x, long y, long w, long 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 )
@@ -87,9 +90,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 )
@@ -101,22 +111,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()
@@ -125,55 +133,81 @@ wxRegion::~wxRegion()
 
 bool wxRegion::operator == ( const wxRegion& region )
 {
-    return m_refData == region.m_refData; 
+    return m_refData == region.m_refData;
 }
 
 bool wxRegion::operator != ( const wxRegion& region )
 {
-    return m_refData != region.m_refData; 
+    return m_refData != region.m_refData;
 }
 
 void wxRegion::Clear()
 {
     UnRef();
-    m_refData = new wxRegionRefData();
-    M_REGIONDATA->m_region = gdk_region_new();
 }
 
-bool wxRegion::Union( long x, long y, long width, long height )
+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;
-    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)
     {
@@ -181,12 +215,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( long x, long y, long width, long height )
+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;
@@ -194,6 +235,12 @@ bool wxRegion::Intersect( long x, long y, long width, long 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;
@@ -201,14 +248,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( long x, long y, long width, long height )
+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;
@@ -216,6 +283,12 @@ bool wxRegion::Subtract( long x, long y, long width, long 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;
@@ -223,14 +296,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( long x, long y, long width, long height )
+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;
@@ -238,6 +330,12 @@ bool wxRegion::Xor( long x, long y, long width, long 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;
@@ -245,10 +343,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)
     {
@@ -256,77 +368,62 @@ 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( long& x, long& y, long&w, long &h ) const
+void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
 {
     x = 0;
     y = 0;
     w = -1;
     h = -1;
-    wxNode *node = GetRectList()->First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        if (node == GetRectList()->First())
-        {
-            x = r->x;
-            y = r->y;
-            w = r->width;
-            h = r->height;
-        }
-        else
-        {
-            if (r->x < x)
-            {
-                x = r->x;
-                w += x - r->x;
-            }
-            if (r->y < y) 
-            {
-                y = r->y;
-                h += y - r->y;
-            }
-            if (r->width+r->x > x+w) 
-            {
-                w = r->x + r->width - x;
-            }
-            if (r->height+r->y > y+h) 
-            {
-                h = r->y + r->height - y;
-            }
-        }
-        node = node->Next();
-    }
+    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;
 }
 
 wxRect wxRegion::GetBox() const
 {
-    long x = 0;
-    long y = 0;
-    long w = -1;
-    long h = -1;
+    wxCoord x = 0;
+    wxCoord y = 0;
+    wxCoord w = -1;
+    wxCoord h = -1;
     GetBox( x, y, w, h );
     return wxRect( x, y, w, h );
 }
 
 bool wxRegion::Empty() const
 {
+    if (!m_refData)
+        return TRUE;
+
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
-wxRegionContain wxRegion::Contains( long x, long y ) const
+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
         return wxOutRegion;
 }
 
-wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) 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;
@@ -354,55 +451,66 @@ 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()
 {
-    m_current = 0;
+    Reset();
 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {
-    m_region = region;
-    m_current = 0;
+    Reset(region);
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;
-    m_current = 0;
+    Reset();
 }
 
-wxRegionIterator::operator bool () const 
-{ 
-    return m_current < m_region.GetRectList()->Number(); 
+wxRegionIterator::operator bool () const
+{
+    return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
 }
 
-bool wxRegionIterator::HaveRects() const 
-{ 
-    return m_current < m_region.GetRectList()->Number(); 
+bool wxRegionIterator::HaveRects() const
+{
+    return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
 }
 
 void wxRegionIterator::operator ++ ()
 {
-    if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (HaveRects()) ++m_current;
 }
 
 void wxRegionIterator::operator ++ (int)
 {
-    if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (HaveRects()) ++m_current;
 }
 
 wxCoord wxRegionIterator::GetX() const
@@ -437,4 +545,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