X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4130e41449b4f5a8749b596e78ac019d67f33169..6258f9d978f9794820ad0a051994d8aad7c5c477:/src/mac/carbon/dcclient.cpp?ds=sidebyside diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 07304d1ecd..7729ec0dbb 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -23,6 +23,8 @@ #include "wx/region.h" #endif +#include "wx/graphics.h" +#include "wx/rawbmp.h" #include "wx/mac/private.h" //----------------------------------------------------------------------------- @@ -110,6 +112,9 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) wxWindowDC::wxWindowDC() { m_window = NULL ; +#if wxMAC_USE_CORE_GRAPHICS + m_release = false; +#endif } wxWindowDC::wxWindowDC(wxWindow *window) @@ -119,30 +124,38 @@ wxWindowDC::wxWindowDC(wxWindow *window) if (!rootwindow) return; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - int x , y ; - x = y = 0 ; - window->MacWindowToRootWindow( &x , &y ) ; m_ok = true ; #if wxMAC_USE_CORE_GRAPHICS m_window->GetSize( &m_width , &m_height); - CGContextRef cg = (CGContextRef) window->MacGetCGContextRef(); - m_release = false; + CGContextRef cg = (CGContextRef) window->MacGetCGContextRef(); + m_release = false; if ( cg == NULL ) - SetGraphicsContext( wxGraphicsContext::Create( window ) ) ; - else - SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) ); - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; - SetClippingRegion( 0 , 0 , m_width , m_height ) ; + { + SetGraphicsContext( wxGraphicsContext::Create( window ) ) ; + } + else + { + CGContextSaveGState( cg ); + m_release = true ; + // make sure the context is having its origin at the wx-window coordinates of the + // view (read at the top of window.cpp about the differences) + if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 ) + CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); + + SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) ); + } + SetClippingRegion( 0 , 0 , m_width , m_height ) ; #else - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; - m_macPort = UMAGetWindowPort( windowref ) ; + int x , y ; + x = y = 0 ; + window->MacWindowToRootWindow( &x , &y ) ; + m_deviceLocalOriginX = x; + m_deviceLocalOriginY = y; + m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ; CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; #endif SetBackground(MacGetBackgroundBrush(window)); @@ -153,27 +166,85 @@ wxWindowDC::wxWindowDC(wxWindow *window) wxWindowDC::~wxWindowDC() { #if wxMAC_USE_CORE_GRAPHICS - if ( m_release && m_graphicContext ) - { -// CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ; - } + if ( m_release ) + { + // this must not necessarily be the current context, we must restore the state of the + // cg we started with above (before the CGContextTranslateCTM call) + CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef(); + CGContextRestoreGState(cg); + } #endif } void wxWindowDC::DoGetSize( int* width, int* height ) const { - wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); - #if wxMAC_USE_CORE_GRAPHICS - if ( width ) - *width = m_width; - if ( height ) - *height = m_height; + if ( width ) + *width = m_width; + if ( height ) + *height = m_height; #else + wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); m_window->GetSize(width, height); #endif } +wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const +{ + // wxScreenDC is derived from wxWindowDC, so a screen dc will + // call this method when a Blit is performed with it as a source. + if (!m_window) + return wxNullBitmap; + + ControlRef handle = (ControlRef) m_window->GetHandle(); + if ( !handle ) + return wxNullBitmap; + + HIRect rect; + CGImageRef image; + CGContextRef context; + void* data; + + size_t bytesPerRow; + + HIViewCreateOffscreenImage( handle, 0, &rect, &image); + + + int width = subrect != NULL ? subrect->width : (int)rect.size.width; + int height = subrect != NULL ? subrect->height : (int)rect.size.height ; + + bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 ); + + data = calloc( 1, bytesPerRow * height ); + context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst ); + + if ( subrect ) + rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ; + CGContextDrawImage( context, rect, image ); + + unsigned char* buffer = (unsigned char*) data; + wxBitmap bmp = wxBitmap(width, height, 32); + wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height)); + + pixData.UseAlpha(); + wxAlphaPixelData::Iterator p(pixData); + for (int y=0; yGetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_window->GetClientSize( &m_width , &m_height); - SetClippingRegion( 0 , 0 , m_width , m_height ) ; + SetDeviceOrigin( origin.x, origin.y ); + SetClippingRegion( 0 , 0 , m_width , m_height ) ; } #else wxClientDC::wxClientDC(wxWindow *window) { + wxCHECK_RET( window, _T("invalid window in wxClientDC") ); m_window = window ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; if (!rootwindow) @@ -214,12 +283,12 @@ wxClientDC::wxClientDC(wxWindow *window) m_macPort = UMAGetWindowPort( windowref ) ; m_ok = true ; - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; + m_deviceLocalOriginX = x ; + m_deviceLocalOriginY = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; SetBackground(MacGetBackgroundBrush(window)); @@ -251,16 +320,12 @@ wxPaintDC::wxPaintDC() #if wxMAC_USE_CORE_GRAPHICS wxPaintDC::wxPaintDC(wxWindow *window) : - wxWindowDC( window ) + wxWindowDC( window ) { wxPoint origin = window->GetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_window->GetClientSize( &m_width , &m_height); - SetClippingRegion( 0 , 0 , m_width , m_height ) ; + SetDeviceOrigin( origin.x, origin.y ); + SetClippingRegion( 0 , 0 , m_width , m_height ) ; } #else wxPaintDC::wxPaintDC(wxWindow *window) @@ -293,13 +358,13 @@ wxPaintDC::wxPaintDC(wxWindow *window) } // there is no out-of-order drawing on OSX #else - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; + m_deviceLocalOriginX = x ; + m_deviceLocalOriginY = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; SetBackground(MacGetBackgroundBrush(window)); #endif