X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index e58d23498d..3c53a68c88 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -21,12 +21,7 @@ #include "wx/region.h" -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include "wx/gtk/private.h" - +#include // ---------------------------------------------------------------------------- // wxRegionRefData: private class containing the information about the region @@ -43,24 +38,38 @@ public: wxRegionRefData(const wxRegionRefData& refData) : wxGDIRefData() { +#ifdef __WXGTK3__ + m_region = cairo_region_copy(refData.m_region); +#else m_region = gdk_region_copy(refData.m_region); +#endif } virtual ~wxRegionRefData() { if (m_region) + { +#ifdef __WXGTK3__ + cairo_region_destroy(m_region); +#else gdk_region_destroy( m_region ); +#endif + } } +#ifdef __WXGTK3__ + cairo_region_t* m_region; +#else GdkRegion *m_region; +#endif }; // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- -#define M_REGIONDATA ((wxRegionRefData *)m_refData) -#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) +#define M_REGIONDATA static_cast(m_refData) +#define M_REGIONDATA_OF(r) static_cast(r.m_refData) IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) @@ -69,8 +78,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) // wxRegion construction // ---------------------------------------------------------------------------- -#define M_REGIONDATA ((wxRegionRefData *)m_refData) - void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { GdkRectangle rect; @@ -81,18 +88,74 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) m_refData = new wxRegionRefData(); +#ifdef __WXGTK3__ + M_REGIONDATA->m_region = cairo_region_create_rectangle(&rect); +#else M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); +#endif } -wxRegion::wxRegion( GdkRegion *region ) +#ifndef __WXGTK3__ +wxRegion::wxRegion(const GdkRegion* region) { m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_copy( region ); + M_REGIONDATA->m_region = gdk_region_copy(const_cast(region)); } +#endif -wxRegion::wxRegion( size_t n, const wxPoint *points, +wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle ) { +#ifdef __WXGTK3__ + // Make a cairo path from the points, draw it onto an image surface, use + // gdk_cairo_region_create_from_surface() to get a cairo region + + // need at least 3 points to make a useful polygon + if (n < 3) + return; + // get bounding rect + int min_x = points[0].x; + int max_x = min_x; + int min_y = points[0].y; + int max_y = min_y; + size_t i; + for (i = 1; i < n; i++) + { + const int x = points[i].x; + if (min_x > x) + min_x = x; + else if (max_x < x) + max_x = x; + const int y = points[i].y; + if (min_y > y) + min_y = y; + else if (max_y < y) + max_y = y; + } + const int w = max_x - min_x + 1; + const int h = max_y - min_y + 1; + // make surface just big enough to contain polygon (A1 is native format + // for gdk_cairo_region_create_from_surface) + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A1, w, h); + memset(cairo_image_surface_get_data(surface), 0, cairo_image_surface_get_stride(surface) * h); + cairo_surface_mark_dirty(surface); + cairo_surface_set_device_offset(surface, -min_x, -min_y); + cairo_t* cr = cairo_create(surface); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + if (fillStyle == wxODDEVEN_RULE) + cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD); + // make path + cairo_move_to(cr, points[0].x, points[0].y); + for (i = 1; i < n; i++) + cairo_line_to(cr, points[i].x, points[i].y); + cairo_close_path(cr); + cairo_fill(cr); + cairo_destroy(cr); + cairo_surface_flush(surface); + m_refData = new wxRegionRefData; + M_REGIONDATA->m_region = gdk_cairo_region_create_from_surface(surface); + cairo_surface_destroy(surface); +#else GdkPoint *gdkpoints = new GdkPoint[n]; for ( size_t i = 0 ; i < n ; i++ ) { @@ -113,6 +176,7 @@ wxRegion::wxRegion( size_t n, const wxPoint *points, M_REGIONDATA->m_region = reg; delete [] gdkpoints; +#endif } wxRegion::~wxRegion() @@ -122,12 +186,14 @@ wxRegion::~wxRegion() wxGDIRefData *wxRegion::CreateGDIRefData() const { - return new wxRegionRefData; + // should never be called + wxFAIL; + return NULL; } wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { - return new wxRegionRefData(*(wxRegionRefData *)data); + return new wxRegionRefData(*static_cast(data)); } // ---------------------------------------------------------------------------- @@ -136,8 +202,13 @@ wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const bool wxRegion::DoIsEqual(const wxRegion& region) const { +#ifdef __WXGTK3__ + return cairo_region_equal( + M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else return gdk_region_equal(M_REGIONDATA->m_region, - M_REGIONDATA_OF(region)->m_region); + M_REGIONDATA_OF(region)->m_region) != 0; +#endif } // ---------------------------------------------------------------------------- @@ -171,7 +242,11 @@ bool wxRegion::DoUnionWithRect(const wxRect& r) rect.width = r.width; rect.height = r.height; +#ifdef __WXGTK3__ + cairo_region_union_rectangle(M_REGIONDATA->m_region, &rect); +#else gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); +#endif } return true; @@ -179,81 +254,92 @@ bool wxRegion::DoUnionWithRect(const wxRect& r) bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - - if (!m_refData) + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); } else { AllocExclusive(); +#ifdef __WXGTK3__ + cairo_region_union(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); +#endif } - gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); - return true; } bool wxRegion::DoIntersect( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - - if (!m_refData) - { - // intersecting with invalid region doesn't make sense + if (region.m_refData == NULL || m_refData == NULL) return false; - } AllocExclusive(); +#ifdef __WXGTK3__ + cairo_region_intersect(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); +#endif return true; } bool wxRegion::DoSubtract( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - - if (!m_refData) - { - // subtracting from an invalid region doesn't make sense + if (region.m_refData == NULL || m_refData == NULL) return false; - } AllocExclusive(); +#ifdef __WXGTK3__ + cairo_region_subtract(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); +#endif return true; } bool wxRegion::DoXor( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - - if (!m_refData) + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) { - return false; + // XOR-ing with an invalid region is the same as XOR-ing with an empty + // one, i.e. it is simply a copy. + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); } + else + { + AllocExclusive(); - AllocExclusive(); - - gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); +#ifdef __WXGTK3__ + cairo_region_xor(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); +#endif + } return true; } bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { - if (!m_refData) - return false; + wxCHECK_MSG( m_refData, false, wxS("invalid region") ); AllocExclusive(); +#ifdef __WXGTK3__ + cairo_region_translate(M_REGIONDATA->m_region, x, y); +#else gdk_region_offset( M_REGIONDATA->m_region, x, y ); +#endif return true; } @@ -267,7 +353,11 @@ bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const if ( m_refData ) { GdkRectangle rect; +#ifdef __WXGTK3__ + cairo_region_get_extents(M_REGIONDATA->m_region, &rect); +#else gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect ); +#endif x = rect.x; y = rect.y; w = rect.width; @@ -288,21 +378,23 @@ bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const bool wxRegion::IsEmpty() const { - if (!m_refData) - return true; - - return gdk_region_empty( M_REGIONDATA->m_region ); +#ifdef __WXGTK3__ + return m_refData == NULL || cairo_region_is_empty(M_REGIONDATA->m_region); +#else + return m_refData == NULL || gdk_region_empty(M_REGIONDATA->m_region); +#endif } wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { - if (!m_refData) +#ifdef __WXGTK3__ + if (m_refData == NULL || !cairo_region_contains_point(M_REGIONDATA->m_region, x, y)) +#else + if (m_refData == NULL || !gdk_region_point_in(M_REGIONDATA->m_region, x, y)) +#endif return wxOutRegion; - if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) - return wxInRegion; - else - return wxOutRegion; + return wxInRegion; } wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const @@ -315,6 +407,14 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const rect.y = r.y; rect.width = r.width; rect.height = r.height; +#ifdef __WXGTK3__ + switch (cairo_region_contains_rectangle(M_REGIONDATA->m_region, &rect)) + { + case CAIRO_REGION_OVERLAP_IN: return wxInRegion; + case CAIRO_REGION_OVERLAP_PART: return wxPartRegion; + default: break; + } +#else GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect ); switch (res) { @@ -322,10 +422,15 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion; case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion; } +#endif return wxOutRegion; } +#ifdef __WXGTK3__ +cairo_region_t* wxRegion::GetRegion() const +#else GdkRegion *wxRegion::GetRegion() const +#endif { if (!m_refData) return NULL; @@ -365,19 +470,38 @@ void wxRegionIterator::CreateRects( const wxRegion& region ) wxDELETEA(m_rects); m_numRects = 0; +#ifdef __WXGTK3__ + cairo_region_t* cairoRegion = region.GetRegion(); + if (cairoRegion == NULL) + return; + m_numRects = cairo_region_num_rectangles(cairoRegion); + + if (m_numRects) + { + m_rects = new wxRect[m_numRects]; + for (int i = 0; i < m_numRects; i++) + { + GdkRectangle gr; + cairo_region_get_rectangle(cairoRegion, i, &gr); + wxRect &wr = m_rects[i]; + wr.x = gr.x; + wr.y = gr.y; + wr.width = gr.width; + wr.height = gr.height; + } + } +#else GdkRegion *gdkregion = region.GetRegion(); if (!gdkregion) return; - GdkRectangle *gdkrects = NULL; - gint numRects = 0; - gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); + GdkRectangle* gdkrects; + gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects); - m_numRects = numRects; - if (numRects) + if (m_numRects) { m_rects = new wxRect[m_numRects]; - for (size_t i=0; i < m_numRects; ++i) + for (int i = 0; i < m_numRects; ++i) { GdkRectangle &gr = gdkrects[i]; wxRect &wr = m_rects[i]; @@ -388,6 +512,7 @@ void wxRegionIterator::CreateRects( const wxRegion& region ) } } g_free( gdkrects ); +#endif } void wxRegionIterator::Reset( const wxRegion& region ) @@ -422,28 +547,28 @@ wxRegionIterator wxRegionIterator::operator ++ (int) wxCoord wxRegionIterator::GetX() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); return m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); return m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); return m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); return m_rects[m_current].height; } @@ -459,20 +584,17 @@ wxRect wxRegionIterator::GetRect() const wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) { - wxDELETEA(m_rects); - - m_current = ri.m_current; - m_numRects = ri.m_numRects; - if ( m_numRects ) - { - m_rects = new wxRect[m_numRects]; - for ( unsigned int n = 0; n < m_numRects; n++ ) - m_rects[n] = ri.m_rects[n]; - } - else + if (this != &ri) { - m_rects = NULL; - } + wxDELETEA(m_rects); + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + memcpy(m_rects, ri.m_rects, m_numRects * sizeof m_rects[0]); + } + } return *this; }