X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bca03736369e836cce9297509505c5972e775dd..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/clipbrd.cpp?ds=sidebyside diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index d0ea791e8b..7acd5845f4 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -27,148 +27,36 @@ #include "wx/metafile.h" -#ifndef __DARWIN__ -#include -#endif - #include "wx/mac/uma.h" #define wxUSE_DATAOBJ 1 #include - // the trace mask we use with wxLogTrace() - call // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // (there will be a *lot* of them!) -static const wxChar *TRACE_CLIPBOARD = wxT("clipboard"); - - -void * wxGetClipboardData( wxDataFormat dataFormat, long *len ) -{ - OSStatus err = noErr; - void * data = NULL; - Size byteCount; - - switch (dataFormat.GetType()) - { - case wxDF_OEMTEXT: - dataFormat = wxDF_TEXT; - break; - - case wxDF_TEXT: - case wxDF_UNICODETEXT: - break; - - case wxDF_BITMAP: - case wxDF_METAFILE: - break; - - default: - // custom datatype - break; - } - -#if TARGET_CARBON - ScrapRef scrapRef; - - err = GetCurrentScrap( &scrapRef ); - if ( err != noTypeErr && err != memFullErr ) - { - ScrapFlavorFlags flavorFlags; - - err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags ); - if (err == noErr) - { - err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount ); - if (err == noErr) - { - Size allocSize = byteCount; - if ( dataFormat.GetType() == wxDF_TEXT ) - allocSize += 1; - else if ( dataFormat.GetType() == wxDF_UNICODETEXT ) - allocSize += 2; - - data = new char[ allocSize ]; - - if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr ) - { - *len = allocSize; - if ( dataFormat.GetType() == wxDF_TEXT ) - ((char*)data)[ byteCount ] = 0; - if ( dataFormat.GetType() == wxDF_UNICODETEXT ) - { - // "data" format is UTF16, so 2 bytes = one character - // wxChar size depends on platform, so just clear last 2 bytes - ((char*)data)[ byteCount + 0 ] = - ((char*)data)[ byteCount + 1 ] = 0; - } - } - else - { - delete [] (char*)data; - data = NULL; - } - } - } - } - -#else - long offset; - Handle datahandle = NewHandle( 0 ); - HLock( datahandle ); - err = (OSStatus)GetScrap( datahandle, dataFormat.GetFormatId(), &offset ); - HUnlock( datahandle ); - if ( GetHandleSize( datahandle ) > 0 ) - { - byteCount = GetHandleSize( datahandle ); - Size allocSize = byteCount; - if ( dataFormat.GetType() == wxDF_TEXT ) - allocSize += 1; - else if ( dataFormat.GetType() == wxDF_UNICODETEXT ) - allocSize += 2; - - data = new char[ allocSize ]; - - memcpy( (char*) data, (char*) *datahandle, byteCount ); - if ( dataFormat.GetType() == wxDF_TEXT ) - ((char*)data)[ byteCount ] = 0; - else if ( dataFormat.GetType() == wxDF_UNICODETEXT ) - ((wxChar*)data)[ byteCount / 2 ] = 0; - *len = byteCount; - } - - DisposeHandle( datahandle ); -#endif - - if (err != noErr) - { - wxLogSysError(wxT("Failed to get clipboard data.")); - - return NULL; - } - - if (dataFormat.GetType() == wxDF_TEXT) - wxMacConvertNewlines10To13( (char*)data ); - - return data; -} +#define TRACE_CLIPBOARD _T("clipboard") IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) wxClipboard::wxClipboard() { m_open = false; - m_data = NULL; + m_data = NULL ; + PasteboardRef clipboard = 0; + OSStatus err = PasteboardCreate( kPasteboardClipboard, &clipboard ); + if (err != noErr) + { + wxLogSysError( wxT("Failed to create the clipboard.") ); + } + m_pasteboard.reset(clipboard); } wxClipboard::~wxClipboard() { - if (m_data != NULL) - { - delete m_data; - m_data = NULL; - } + m_pasteboard.reset((PasteboardRef)0); + delete m_data; } void wxClipboard::Clear() @@ -179,14 +67,7 @@ void wxClipboard::Clear() m_data = NULL; } -#if TARGET_CARBON - OSStatus err; - err = ClearCurrentScrap(); -#else - OSErr err; - err = ZeroScrap(); -#endif - + OSStatus err = PasteboardClear( m_pasteboard ); if (err != noErr) { wxLogSysError( wxT("Failed to empty the clipboard.") ); @@ -214,6 +95,9 @@ bool wxClipboard::IsOpened() const bool wxClipboard::SetData( wxDataObject *data ) { + if ( IsUsingPrimarySelection() ) + return false; + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); wxCHECK_MSG( data, false, wxT("data is invalid") ); @@ -226,78 +110,22 @@ bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data ) { + if ( IsUsingPrimarySelection() ) + return false; + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); wxCHECK_MSG( data, false, wxT("data is invalid") ); // we can only store one wxDataObject Clear(); - m_data = data; - - // get formats from wxDataObjects - wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; - m_data->GetAllFormats( array ); - - for (size_t i = 0; i < m_data->GetFormatCount(); i++) - { - if (array[i].IsStandard()) - { - wxLogTrace( TRACE_CLIPBOARD, - wxT("wxClipboard now supports standard atom type %d"), - array[i].GetType() ); - } - else - { - wxLogTrace( TRACE_CLIPBOARD, - wxT("wxClipboard now supports atom %s"), - array[i].GetId().c_str() ); - } - - size_t sz = data->GetDataSize( array[ i ] ); - void* buf = malloc( sz + 1 ); - if ( buf != NULL ) - { - // empty the buffer because in some case GetDataHere does not fill buf - memset( buf, 0, sz + 1 ); - data->GetDataHere( array[ i ], buf ); - OSType mactype = 0; - switch ( array[i].GetType() ) - { - case wxDF_TEXT: - case wxDF_OEMTEXT: - mactype = kScrapFlavorTypeText; - sz -= 1; - break; - -#if wxUSE_UNICODE - case wxDF_UNICODETEXT: - mactype = kScrapFlavorTypeUnicode; - sz -= 2; - break; -#endif - -#if wxUSE_DRAG_AND_DROP - case wxDF_METAFILE: - mactype = kScrapFlavorTypePicture; - break; -#endif - - case wxDF_BITMAP: - case wxDF_DIB: - mactype = kScrapFlavorTypePicture; - break; - - default: - mactype = (OSType)(array[ i ].GetFormatId()); - break; - } + PasteboardSyncFlags syncFlags = PasteboardSynchronize( m_pasteboard ); + wxCHECK_MSG( !(syncFlags&kPasteboardModified), false, wxT("clipboard modified after clear") ); + wxCHECK_MSG( (syncFlags&kPasteboardClientIsOwner), false, wxT("client couldn't own clipboard") ); - UMAPutScrap( sz , mactype , buf ); - free( buf ); - } - } + m_data = data; - delete [] array; + data->AddToPasteboard( m_pasteboard, 1 ); return true; } @@ -320,56 +148,19 @@ void wxClipboard::Close() bool wxClipboard::IsSupported( const wxDataFormat &dataFormat ) { + wxLogTrace(TRACE_CLIPBOARD, wxT("Checking if format %s is available"), + dataFormat.GetId().c_str()); + if ( m_data ) return m_data->IsSupported( dataFormat ); - - bool hasData = false; - -#if TARGET_CARBON - OSStatus err = noErr; - ScrapRef scrapRef; - - err = GetCurrentScrap( &scrapRef ); - if ( err != noTypeErr && err != memFullErr ) - { - ScrapFlavorFlags flavorFlags; - Size byteCount; - - err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags ); - if (err == noErr) - { - err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount ); - if (err == noErr) - hasData = true; - } - else if ( dataFormat.GetType() == wxDF_UNICODETEXT ) - { - err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags ); - if (err == noErr) - { - err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount ); - if (err == noErr) - hasData = true; - } - } - } - -#else - - long offset = 0; - Handle datahandle = NewHandle( 0 ); - HLock( datahandle ); - GetScrap( datahandle, dataFormat.GetFormatId(), &offset ); - HUnlock( datahandle ); - hasData = GetHandleSize( datahandle ) > 0; - DisposeHandle( datahandle ); -#endif - - return hasData; + return wxDataObject::IsFormatInPasteboard( m_pasteboard, dataFormat ); } bool wxClipboard::GetData( wxDataObject& data ) { + if ( IsUsingPrimarySelection() ) + return false; + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); size_t formatcount = data.GetFormatCount() + 1; @@ -407,33 +198,7 @@ bool wxClipboard::GetData( wxDataObject& data ) // get formats from wxDataObjects if ( !transferred ) { - for (size_t i = 0; !transferred && i < formatcount; i++) - { - wxDataFormat format = array[ i ]; - - switch ( format.GetType() ) - { - // NOTE: this is usable for all data types - case wxDF_TEXT: - case wxDF_UNICODETEXT: - case wxDF_OEMTEXT: - case wxDF_BITMAP: - case wxDF_METAFILE: - default: - { - long len; - char* s = (char*)wxGetClipboardData( format, &len ); - if (s != NULL) - { - data.SetData( format, len, s ); - delete [] s; - - transferred = true; - } - } - break; - } - } + transferred = data.GetFromPasteboard( m_pasteboard ) ; } delete [] array;