X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb1a7cf93d320fd775f82ca237b28e91bdc7314f..52af3158e974b042008474268570f3bdb7ce95ee:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index f16d43979d..2ec91c4760 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -1,32 +1,36 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.cpp +// Name: src/mac/carbon/dcclient.cpp // Purpose: wxClientDC class // Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #include "wx/dcclient.h" -#include "wx/dcmemory.h" -#include "wx/region.h" -#include "wx/window.h" -#include "wx/toplevel.h" -#include "wx/settings.h" -#include "wx/math.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/window.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/toplevel.h" + #include "wx/math.h" + #include "wx/region.h" +#endif + +#include "wx/graphics.h" +#include "wx/rawbmp.h" #include "wx/mac/private.h" -#include "wx/log.h" //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- -#define RAD2DEG 57.2957795131 - //----------------------------------------------------------------------------- // wxPaintDC //----------------------------------------------------------------------------- @@ -42,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) #include "wx/mac/uma.h" #include "wx/notebook.h" #include "wx/tabctrl.h" - + static wxBrush MacGetBackgroundBrush( wxWindow* window ) { @@ -71,7 +75,11 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) break ; } - if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) ) + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) +#if wxUSE_TAB_DIALOG + || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) +#endif // wxUSE_TAB_DIALOG + ) { Rect extent = { 0 , 0 , 0 , 0 } ; int x , y ; @@ -83,11 +91,11 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) extent.top-- ; extent.right = x + size.x ; extent.bottom = y + size.y ; - bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; + bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; break ; } - - parent = parent->GetParent() ; + + parent = parent->GetParent() ; } } @@ -99,73 +107,141 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) #endif return bkdBrush ; -} +} -wxWindowDC::wxWindowDC() +wxWindowDC::wxWindowDC() { m_window = NULL ; +#if wxMAC_USE_CORE_GRAPHICS + m_release = false; +#endif } -wxWindowDC::wxWindowDC(wxWindow *window) +wxWindowDC::wxWindowDC(wxWindow *window) { m_window = window ; wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; if (!rootwindow) return; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - int x , y ; - x = y = 0 ; - wxSize size = window->GetSize() ; - window->MacWindowToRootWindow( &x , &y ) ; - m_macPort = UMAGetWindowPort( windowref ) ; m_ok = true ; #if wxMAC_USE_CORE_GRAPHICS - m_macLocalOriginInPort.x = x ; - m_macLocalOriginInPort.y = y ; - - if ( window->MacGetCGContextRef() ) + m_window->GetSize( &m_width , &m_height); + CGContextRef cg = (CGContextRef) window->MacGetCGContextRef(); + m_release = false; + if ( cg == NULL ) { - m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); + SetGraphicsContext( wxGraphicsContext::Create( window ) ) ; } else { - // as out of order redraw is not supported under CQ, we have to create a qd port for these - // situations - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; - - m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); + 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 ) ); } - // there is no out-of-order drawing on OSX + SetClippingRegion( 0 , 0 , m_width , m_height ) ; #else - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; + 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 ) ; - SetBackground(MacGetBackgroundBrush(window)); #endif + SetBackground(MacGetBackgroundBrush(window)); SetFont( window->GetFont() ) ; } wxWindowDC::~wxWindowDC() { +#if wxMAC_USE_CORE_GRAPHICS + 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 { +#if wxMAC_USE_CORE_GRAPHICS + 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)); + + wxAlphaPixelData::Iterator p(pixData); + for (int y=0; yGetClientAreaOrigin() ; + m_window->GetClientSize( &m_width , &m_height); + SetDeviceOrigin( origin.x, origin.y ); + SetClippingRegion( 0 , 0 , m_width , m_height ) ; +} +#else wxClientDC::wxClientDC(wxWindow *window) { m_window = window ; @@ -194,60 +280,31 @@ wxClientDC::wxClientDC(wxWindow *window) m_macPort = UMAGetWindowPort( windowref ) ; m_ok = true ; -#if wxMAC_USE_CORE_GRAPHICS - m_macLocalOriginInPort.x = x ; - m_macLocalOriginInPort.y = y ; - if ( window->MacGetCGContextRef() ) - { - m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; - SetClippingRegion( 0 , 0 , size.x , size.y ) ; - SetBackground(MacGetBackgroundBrush(window)); - } - else - { - // as out of order redraw is not supported under CQ, - // we have to create a QD port for these situations - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; - m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; - } -#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 ) ; - 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)); SetFont( window->GetFont() ) ; } +#endif wxClientDC::~wxClientDC() { -#if wxMAC_USE_CORE_GRAPHICS -/* - if ( m_window->MacGetCGContextRef() == 0) - { - CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; - CGContextFlush( cgContext ) ; - } -*/ -#endif } +#if !wxMAC_USE_CORE_GRAPHICS void wxClientDC::DoGetSize(int *width, int *height) const { wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); m_window->GetClientSize( width, height ); } +#endif /* * wxPaintDC @@ -258,6 +315,16 @@ wxPaintDC::wxPaintDC() m_window = NULL ; } +#if wxMAC_USE_CORE_GRAPHICS +wxPaintDC::wxPaintDC(wxWindow *window) : + wxWindowDC( window ) +{ + wxPoint origin = window->GetClientAreaOrigin() ; + m_window->GetClientSize( &m_width , &m_height); + SetDeviceOrigin( origin.x, origin.y ); + SetClippingRegion( 0 , 0 , m_width , m_height ) ; +} +#else wxPaintDC::wxPaintDC(wxWindow *window) { m_window = window ; @@ -273,8 +340,6 @@ wxPaintDC::wxPaintDC(wxWindow *window) m_ok = true ; #if wxMAC_USE_CORE_GRAPHICS - m_macLocalOriginInPort.x = x ; - m_macLocalOriginInPort.y = y ; if ( window->MacGetCGContextRef() ) { m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; @@ -290,27 +355,30 @@ 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 SetFont( window->GetFont() ) ; } +#endif wxPaintDC::~wxPaintDC() { } +#if !wxMAC_USE_CORE_GRAPHICS void wxPaintDC::DoGetSize(int *width, int *height) const { wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); m_window->GetClientSize( width, height ); } +#endif