moving to PDF for metafiles on Quartz

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/dataobj.cpp

@@ -88,7 +88,11 @@ void wxDataFormat::SetType( wxDataFormatId dataType )
 #endif
         break;
     case wxDF_METAFILE:
+#if wxMAC_USE_CORE_GRAPHICS
+        m_format = 'PDF ';
+#else
         m_format = kScrapFlavorTypePicture;
+#endif
         break;
 
     case wxDF_FILENAME:

src/mac/carbon/metafile.cpp

@@ -33,58 +33,181 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 
+#define M_METAFILEREFDATA( a ) ((wxMetafileRefData*)(a).GetRefData())
+
 class wxMetafileRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxMetafile;
-
 public:
-    wxMetafileRefData();
+#if wxMAC_USE_CORE_GRAPHICS
+    // creates a metafile from memory, assumes ownership
+    wxMetafileRefData(CFDataRef data);    
+#else
+    // creates a metafile from memory, assumes ownership
+    wxMetafileRefData(Handle data);    
+#endif
+    // prepares a recording metafile
+    wxMetafileRefData( int width, int height);    
+    // prepares a metafile to be read from a file (if filename is not empty)
+    wxMetafileRefData( const wxString& filename);    
     virtual ~wxMetafileRefData();
     
-private:
+    void Init();
-    PicHandle m_metafile;
 
 #if wxMAC_USE_CORE_GRAPHICS
-    QDPictRef m_qdPictRef;
+    CGPDFDocumentRef GetPDFDocument() const { return m_pdfDoc; }
+    void UpdateDocumentFromData() ;
+
+    const wxCFDataRef& GetData() const { return m_data; }
+    CGContextRef GetContext() const { return m_context; }
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
+#else
+    Handle GetHandle() const { return m_metafile; }
 #endif
+    // ends the recording
+    void Close();
+private:
+#if wxMAC_USE_CORE_GRAPHICS
+    wxCFDataRef m_data;
+    wxCFRef<CGPDFDocumentRef> m_pdfDoc;
+    CGContextRef m_context;
+#else
+    PicHandle m_metafile;
+#endif
+    int m_width ;
+    int m_height ;
 };
 
-wxMetafileRefData::wxMetafileRefData()
+#if! wxMAC_USE_CORE_GRAPHICS
+wxMetafileRefData::wxMetafileRefData(Handle pict)
 {
-    m_metafile = NULL;
+    Init();
+    m_metafile = pict;
 
+    Rect r;
+    wxMacGetPictureBounds( m_metafile, &r );
+    m_width = r.right - r.left;
+    m_height = r.bottom - r.top;
+}
+#else
+wxMetafileRefData::wxMetafileRefData(CFDataRef data) :
+    m_data(data)
+{
+    Init();
+    UpdateDocumentFromData();
+}
+#endif
+
+wxMetafileRefData::wxMetafileRefData( const wxString& filename )
+{
+    Init();
 #if wxMAC_USE_CORE_GRAPHICS
-    m_qdPictRef = NULL;
+    if ( !filename.empty() )
+    {
+        wxCFRef<CFMutableStringRef> cfMutableString(CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(filename)));
+        CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+        wxCFRef<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
+        m_pdfDoc.reset(CGPDFDocumentCreateWithURL(url));
+    }
+#else
+    wxASSERT_MSG( filename.empty(), wxT("no file-based metafile support yet") );
+    m_metafile = NULL;
+#endif
+}
+
+
+wxMetafileRefData::wxMetafileRefData( int width, int height)
+{
+    Init();
+    
+    m_width = width;
+    m_height = height;
+#if wxMAC_USE_CORE_GRAPHICS
+    CGRect r = CGRectMake( 0 , 0 , width  , height );
+
+    CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 0);
+    m_data.reset(data);
+    CGDataConsumerRef dataConsumer = CGDataConsumerCreateWithCFData(data);
+    m_context = CGPDFContextCreate( dataConsumer, (width != 0 && height != 0) ? &r : NULL , NULL );
+    CGDataConsumerRelease( dataConsumer );
+    if ( m_context )
+    {
+        if ( &CGPDFContextBeginPage != NULL )
+            CGPDFContextBeginPage(m_context, NULL);
+        else
+            CGContextBeginPage(m_context, NULL);
+
+        CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
+
+        CGContextSetFillColorSpace( m_context, genericColorSpace );
+        CGContextSetStrokeColorSpace( m_context, genericColorSpace );
+
+        CGContextTranslateCTM( m_context , 0 ,  height ) ;
+        CGContextScaleCTM( m_context , 1 , -1 ) ;
+    }
+#else
+    Rect r = { 0, 0, height, width };
+    m_metafile = OpenPicture( &r ) ;
 #endif
 }
 
 wxMetafileRefData::~wxMetafileRefData()
 {
+#if! wxMAC_USE_CORE_GRAPHICS
     if (m_metafile)
     {
-#ifndef __LP64__
         KillPicture( (PicHandle)m_metafile );
         m_metafile = NULL;
+    }
+#endif
+}
+
+void wxMetafileRefData::Init()
+{
+#if wxMAC_USE_CORE_GRAPHICS
+    m_context = NULL;
+#else
+    m_metafile = NULL;
+#endif
+    m_width = -1;
+    m_height = -1;
+}
+
+void wxMetafileRefData::Close()
+{
+#if wxMAC_USE_CORE_GRAPHICS
+    if ( &CGPDFContextEndPage != NULL )
+        CGPDFContextEndPage(m_context);
+    else
+        CGContextEndPage(m_context);
+
+    CGContextRelease(m_context);
+    m_context = NULL;
+    
+    UpdateDocumentFromData();
+#else
+    ClosePicture();
+#endif
+}
 
 #if wxMAC_USE_CORE_GRAPHICS
-        QDPictRelease( m_qdPictRef );
+void wxMetafileRefData::UpdateDocumentFromData() 
-        m_qdPictRef = NULL;
+{
-#endif
+    wxCFRef<CGDataProviderRef> provider(CGDataProviderCreateWithCFData(m_data));
-#endif
+    m_pdfDoc.reset(CGPDFDocumentCreateWithProvider(provider));
+    if ( m_pdfDoc != NULL )
+    {
+        CGPDFPageRef page = CGPDFDocumentGetPage( m_pdfDoc, 1 );
+        CGRect rect = CGPDFPageGetBoxRect ( page, kCGPDFMediaBox);
+        m_width = rect.size.width;
+        m_height = rect.size.height;
     }
 }
+#endif
 
 wxMetaFile::wxMetaFile(const wxString& file)
 {
-    m_refData = new wxMetafileRefData;
+    m_refData = new wxMetafileRefData(file);
-
-    M_METAFILEDATA->m_metafile = NULL;
-    wxASSERT_MSG( file.empty(), wxT("no file-based metafile support yet") );
-
-#if 0
-    if (!file.IsNull() && (file.Cmp("") == 0))
-        M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile( file );
-#endif
 }
 
 wxMetaFile::~wxMetaFile()
@@ -93,12 +216,20 @@ wxMetaFile::~wxMetaFile()
 
 bool wxMetaFile::IsOk() const
 {
-    return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL));
+#if wxMAC_USE_CORE_GRAPHICS
+    return (M_METAFILEDATA && (M_METAFILEDATA->GetData() != NULL));
+#else
+    return (M_METAFILEDATA && (M_METAFILEDATA->GetHandle() != NULL));
+#endif
 }
 
 WXHMETAFILE wxMetaFile::GetHMETAFILE() const
 {
-    return (WXHMETAFILE) M_METAFILEDATA->m_metafile;
+#if wxMAC_USE_CORE_GRAPHICS
+    return (WXHMETAFILE) (CFDataRef) M_METAFILEDATA->GetData();
+#else
+    return (WXHMETAFILE) M_METAFILEDATA->GetHandle();
+#endif
 }
 
 bool wxMetaFile::SetClipboard(int width, int height)
@@ -106,7 +237,6 @@ bool wxMetaFile::SetClipboard(int width, int height)
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP
-    // TODO: to finish this port, we need the data object first
     if (m_refData == NULL)
         return false;
 
@@ -130,28 +260,10 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {
     UnRef();
 
-    m_refData = new wxMetafileRefData;
-
-    M_METAFILEDATA->m_metafile = (PicHandle)mf;
-
 #if wxMAC_USE_CORE_GRAPHICS
-    size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile );
+    m_refData = new wxMetafileRefData((CFDataRef)mf);
-    wxMemoryBuffer* membuf = new wxMemoryBuffer( sz );
+#else
-    void *data = membuf->GetWriteBuf( sz );
+    m_refData = new wxMetafileRefData((Handle)mf);
-
-    memcpy( data, *M_METAFILEDATA->m_metafile, sz );
-    membuf->UngetWriteBuf( sz );
-    CGDataProviderRef provider = CGDataProviderCreateWithData(
-        membuf, data, sz, wxMacMemoryBufferReleaseProc );
-    M_METAFILEDATA->m_qdPictRef = NULL;
-
-#ifndef __LP64__
-    if (provider != NULL)
-    {
-        M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider );
-        CGDataProviderRelease( provider );
-    }
-#endif
 #endif
 }
 
@@ -165,17 +277,13 @@ bool wxMetaFile::Play(wxDC *dc)
 
     {
 #if wxMAC_USE_CORE_GRAPHICS
-#ifndef __LP64__
-        QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef;
         CGContextRef cg = (CGContextRef) dc->GetGraphicsContext()->GetNativeContext();
-        CGRect bounds = QDPictGetBounds( cgPictRef );
+        CGPDFDocumentRef doc = M_METAFILEDATA->GetPDFDocument();
-
+        CGPDFPageRef page = CGPDFDocumentGetPage( doc, 1 );
-        CGContextSaveGState( cg );
+        wxMacCGContextStateSaver save(cg);
-        CGContextTranslateCTM( cg, 0, bounds.size.width );
+        CGContextDrawPDFPage( cg, page );
-        CGContextScaleCTM( cg, 1, -1 );
+//        CGContextTranslateCTM( cg, 0, bounds.size.width );
-        QDPictDrawToCGContext( cg, bounds, cgPictRef );
+//        CGContextScaleCTM( cg, 1, -1 );
-        CGContextRestoreGState( cg );
-#endif
 #else
         PicHandle pict = (PicHandle)GetHMETAFILE();
         wxMacPortSetter helper( dc );
@@ -193,13 +301,8 @@ wxSize wxMetaFile::GetSize() const
 
     if (Ok())
     {
-#ifndef __LP64__
+        dataSize.x = M_METAFILEDATA->GetWidth();
-       PicHandle pict = (PicHandle)GetHMETAFILE();
+        dataSize.y = M_METAFILEDATA->GetHeight();
-        Rect r;
-        wxMacGetPictureBounds( pict, &r );
-        dataSize.x = r.right - r.left;
-        dataSize.y = r.bottom - r.top;
-#endif
     }
 
     return dataSize;
@@ -219,17 +322,17 @@ wxMetaFileDC::wxMetaFileDC(
     wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet"));
 
     m_metaFile = new wxMetaFile( filename );
-
+    wxMetafileRefData* metafiledata = new wxMetafileRefData(width, height);
+    m_metaFile->UnRef();
+    m_metaFile->SetRefData( metafiledata );
 #if wxMAC_USE_CORE_GRAPHICS
+    SetGraphicsContext( wxGraphicsContext::CreateFromNative(metafiledata->GetContext()));
+    m_ok = (m_graphicContext != NULL) ;
 #else
     Rect r = { 0, 0, height, width };
-
     RectRgn( (RgnHandle)m_macBoundaryClipRgn, &r );
     CopyRgn( (RgnHandle)m_macBoundaryClipRgn, (RgnHandle)m_macCurrentClipRgn );
-
-    m_metaFile->SetHMETAFILE( (WXHMETAFILE)OpenPicture( &r ) );
     ::GetPort( (GrafPtr*)&m_macPort );
-
     m_ok = true;
 #endif
 
@@ -253,36 +356,68 @@ void wxMetaFileDC::DoGetSize(int *width, int *height) const
 
 wxMetaFile *wxMetaFileDC::Close()
 {
-#ifndef __LP64__
+#if wxMAC_USE_CORE_GRAPHICS
-    ClosePicture();
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+    m_ok = false;
 #endif
+
+    M_METAFILEREFDATA(*m_metaFile)->Close();
+
     return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {
+#if wxMAC_USE_CORE_GRAPHICS
+    CFIndex length = 0;
+    wxMetafileRefData* refData = M_METAFILEREFDATA(m_metafile);
+    if ( refData )
+        length = refData->GetData().GetLength();
+    return length;
+#else
     return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() );
+#endif
 }
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
+    bool result = false;
+#if wxMAC_USE_CORE_GRAPHICS
+    wxMetafileRefData* refData = M_METAFILEREFDATA(m_metafile);
+    if ( refData )
+    {   
+        CFIndex length = refData->GetData().GetLength();
+        if ( length > 0 )
+        {
+            result = true ;
+            refData->GetData().GetBytes(CFRangeMake(0,length), (UInt8 *) buf);
+        }
+    } 
+#else
     Handle pictH = (Handle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE();
-    bool result = (pictH != NULL);
+    result = (pictH != NULL);
 
     if (result)
         memcpy( buf, *pictH, GetHandleSize( pictH ) );
 
+#endif
     return result;
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {
+#if wxMAC_USE_CORE_GRAPHICS
+    wxMetafileRefData* metafiledata = new wxMetafileRefData(wxCFRefFromGet(wxCFDataRef((UInt8*)buf, len).get()));
+    m_metafile.UnRef();
+    m_metafile.SetRefData( metafiledata );
+#else
     Handle handle = NewHandle( len );
     SetHandleSize( handle, len );
     memcpy( *handle, buf, len );
     m_metafile.SetHMETAFILE( (WXHMETAFILE) handle );
-
+#endif
     return true;
 }
 #endif