X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c736e563cbf50bc5825c1a52878403ee48f513..b1d7de5ae0c53162b57ac20cfed04264f0f27b30:/src/mac/carbon/clipbrd.cpp

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 2f7651852a..7e48c9ec34 100644
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -1,16 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.cpp
 // Purpose:     Clipboard functionality
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation
 #pragma implementation "clipbrd.h"
 #endif
 
@@ -21,6 +20,12 @@
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
+#include "wx/log.h"
+
+#ifndef __DARWIN__
+#include <Scrap.h>
+#endif
+#include "wx/mac/uma.h"
 
 #define wxUSE_DATAOBJ 1
 
@@ -34,79 +39,95 @@ static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
 #if !TARGET_CARBON
-	OSErr err = noErr ;
+    OSErr err = noErr ;
 #else
-	OSStatus err = noErr ;
+    OSStatus err = noErr ;
 #endif
-  void * data = NULL ;
-	
+    void * data = NULL ;
+    Size byteCount;
+
     switch (dataFormat.GetType())
     {
-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
+    case wxDF_OEMTEXT:
+        dataFormat = wxDF_TEXT;
+        // fall through
+
+    case wxDF_TEXT:
+        break;
+    case wxDF_UNICODETEXT:
+        break;
+    case wxDF_BITMAP :
+    case wxDF_METAFILE :
+        break ;
+    default:
+        {
+            wxLogError(_("Unsupported clipboard format."));
+            return NULL;
+        }
+    }
+
+#if TARGET_CARBON
+    ScrapRef scrapRef;
+
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )
+    {
+        ScrapFlavorFlags    flavorFlags;
 
-        case wxDF_TEXT:
-                break;
-        default:
+        if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
+        {
+            if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
+                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 )
+                        ((wxChar*)data)[byteCount/2] = 0 ;
+                }
+                else
+                {
+                    delete[] ((char *)data) ;
+                    data = NULL ;
+                }
             }
+        }
     }
 
-#if TARGET_CARBON
-  	ScrapRef scrapRef;
-  	
-  	err = GetCurrentScrap( &scrapRef );
-  	if ( err != noTypeErr && err != memFullErr )	
-  	{
-  		ScrapFlavorFlags	flavorFlags;
-  		Size				byteCount;
-  		
-  		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-  		{
-  			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-  			{
-  			  if ( dataFormat.GetType() == wxDF_TEXT )
-  			    byteCount++ ;
-  			    
-          data = new char[ byteCount ] ;
-          if (( err = GetScrapFlavorData( scrapRef, dataFormat.GetFormatId(), &byteCount , data )) == noErr )
-          {
-            *len = byteCount ;
-  			    if ( dataFormat.GetType() == wxDF_TEXT )  
-  		        ((char*)data)[byteCount] = 0 ;
-          }
-          else
-          {
-            delete[] ((char *)data) ;
-            data = NULL ;
-          }
-	   		}
-  		}
-  	}
-	
 #else
-  	long offset ;
-  	Handle datahandle = NewHandle(0) ;
-  	HLock( datahandle ) ;
-  	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-  	HUnlock( datahandle ) ;
-  	if ( GetHandleSize( datahandle ) > 0 )
-  	{
-  	  long byteCount = GetHandleSize( datahandle ) ;
-  	  if ( dataFormat.GetType() == wxDF_TEXT )  
-  	    data = new char[ byteCount + 1] ;
-      else
-        data = new char[ byteCount ] ;
-
-  	  memcpy( (char*) data , (char*) *datahandle , byteCount ) ;
-  	  if ( dataFormat.GetType() == wxDF_TEXT )  
-  		  ((char*)data)[byteCount] = 0 ;
-  	  * len = byteCount ;
-  	}
-  	DisposeHandle( datahandle ) ;
+    long offset ;
+    Handle datahandle = NewHandle(0) ;
+    HLock( datahandle ) ;
+    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 ;
+        if ( dataFormat.GetType() == wxDF_UNICODETEXT )
+            ((wxChar*)data)[byteCount/2] = 0 ;
+        *len = byteCount ;
+    }
+    DisposeHandle( datahandle ) ;
 #endif
     if ( err )
     {
@@ -114,10 +135,12 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
         return NULL ;
     }
-    if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
+
+    if ( dataFormat.GetType() == wxDF_TEXT )
     {
-      wxMacConvertToPC((char*)data) ;
+        wxMacConvertNewlines10To13( (char*) data ) ;
     }
+
     return data;
 }
 
@@ -126,12 +149,12 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
-  m_open = false ;
-  m_data = NULL ;
+    m_open = false ;
+    m_data = NULL ;
 }
 
 wxClipboard::~wxClipboard()
@@ -151,16 +174,16 @@ void wxClipboard::Clear()
         m_data = (wxDataObject*) NULL;
     }
 #if TARGET_CARBON
-	OSStatus err ;
-	err = ClearCurrentScrap( );
+    OSStatus err ;
+    err = ClearCurrentScrap( );
 #else
-	OSErr err ;
-	err = ZeroScrap( );
+    OSErr err ;
+    err = ZeroScrap( );
 #endif
-	if ( err )
-	{
+    if ( err )
+    {
         wxLogSysError(_("Failed to empty the clipboard."));
-	}
+    }
 }
 
 bool wxClipboard::Flush()
@@ -187,7 +210,8 @@ bool wxClipboard::SetData( wxDataObject *data )
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
     Clear();
-
+    // as we can only store one wxDataObject, this is the same in this
+    // implementation
     return AddData( data );
 }
 
@@ -197,8 +221,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
-    wxDataFormat format = data->GetPreferredFormat();
-
     /* we can only store one wxDataObject */
     Clear();
 
@@ -214,67 +236,38 @@ bool wxClipboard::AddData( wxDataObject *data )
                     wxT("wxClipboard now supports atom %s"),
                     array[i].GetId().c_str() );
 
-#if !TARGET_CARBON
-	      OSErr err = noErr ;
-#else
-	      OSStatus err = noErr ;
-#endif
-
-       switch ( array[i].GetType() )
-       {
-           case wxDF_TEXT:
-           case wxDF_OEMTEXT:
-           {
-               wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-               wxString str(textDataObject->GetText());
-              	wxString mac ;
-              	if ( wxApp::s_macDefaultEncodingIsPC )
-              	{
-              		mac = wxMacMakeMacStringFromPC(textDataObject->GetText()) ;
-              	}
-              	else
-              	{
-              		mac = textDataObject->GetText() ;
-              	}
-        #if !TARGET_CARBON
-        				err = PutScrap( mac.Length() , 'TEXT' , mac.c_str() ) ;
-        #else
-        				ScrapRef	scrap;
-        				err = GetCurrentScrap (&scrap); 
-        				if ( !err )
-        				{
-        					err = PutScrapFlavor (scrap, 'TEXT', 0, mac.Length(), mac.c_str());
-        				}
-        #endif
-           }
-
-#if wxUSE_DRAG_AND_DROP
-        case wxDF_METAFILE:
-           {
-              wxMetafileDataObject* metaFileDataObject =
-                (wxMetafileDataObject*) data;
-              wxMetafile metaFile = metaFileDataObject->GetMetafile();
-      				PicHandle pict = metaFile->GetHMETAFILE() ;
-      				HLock( (Handle) pict ) ;
-      #if !TARGET_CARBON
-      				err = PutScrap( GetHandleSize(  (Handle) pict ) , 'PICT' , *pict ) ;
-      #else
-      				ScrapRef	scrap;
-      				err = GetCurrentScrap (&scrap); 
-      				if ( !err )
-      				{
-      					err = PutScrapFlavor (scrap, 'PICT', 0, GetHandleSize((Handle) pict), *pict);
-      				}
-      #endif
-      				HUnlock(  (Handle) pict ) ;
-           }
-#endif
-           case wxDF_BITMAP:
-           case wxDF_DIB:
-           default:
-      			break ;
-       }
-
+        size_t sz = data->GetDataSize( array[i] ) ;
+        void* buf = malloc( sz + 1 ) ;
+        if ( buf )
+        {        
+            data->GetDataHere( array[i] , buf ) ;
+            OSType mactype = 0 ;
+            switch ( array[i].GetType() )
+            {
+               case wxDF_TEXT:
+               case wxDF_OEMTEXT:
+                    mactype = kScrapFlavorTypeText ;
+               break ;
+    #if wxUSE_UNICODE
+               case wxDF_UNICODETEXT :
+                    mactype = kScrapFlavorTypeUnicode ;
+               break ;
+    #endif
+    #if wxUSE_DRAG_AND_DROP
+            case wxDF_METAFILE:
+                    mactype = kScrapFlavorTypePicture ;
+               break ;
+    #endif
+               case wxDF_BITMAP:
+               case wxDF_DIB:
+                    mactype = kScrapFlavorTypePicture ;
+                    break ;
+               default:
+                    break ;
+            }
+            UMAPutScrap( sz , mactype , buf ) ;
+            free( buf ) ;
+        }
     }
 
     delete[] array;
@@ -284,7 +277,18 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
+
     m_open = false ;
+    
+ 	// Get rid of cached object.  If this is not done copying from another application will
+ 	// only work once
+    if (m_data)
+    {
+        delete m_data;
+        m_data = (wxDataObject*) NULL;
+    }    
+	    
 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
@@ -294,34 +298,34 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
     return m_data->IsSupported( dataFormat ) ;
   }
 #if TARGET_CARBON
-	OSStatus err = noErr;
-	ScrapRef scrapRef;
-	
-	err = GetCurrentScrap( &scrapRef );
-	if ( err != noTypeErr && err != memFullErr )	
-	{
-		ScrapFlavorFlags	flavorFlags;
-		Size				byteCount;
-		
-		if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
-		{
-			if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
-			{
-				return TRUE ;
-			}
-		}
-	}
-	return FALSE;
-	
+    OSStatus err = noErr;
+    ScrapRef scrapRef;
+
+    err = GetCurrentScrap( &scrapRef );
+    if ( err != noTypeErr && err != memFullErr )
+    {
+        ScrapFlavorFlags    flavorFlags;
+        Size                byteCount;
+
+        if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
+        {
+            if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
+            {
+                return TRUE ;
+            }
+        }
+    }
+    return FALSE;
+
 #else
-	long offset ;
-	Handle datahandle = NewHandle(0) ;
-	HLock( datahandle ) ;
-	GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
-	HUnlock( datahandle ) ;
-	bool hasData = GetHandleSize( datahandle ) > 0 ;
-	DisposeHandle( datahandle ) ;
-	return hasData ;
+    long offset ;
+    Handle datahandle = NewHandle(0) ;
+    HLock( datahandle ) ;
+    GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ;
+    HUnlock( datahandle ) ;
+    bool hasData = GetHandleSize( datahandle ) > 0 ;
+    DisposeHandle( datahandle ) ;
+    return hasData ;
 #endif
 }
 
@@ -329,7 +333,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
-    int formatcount = data.GetFormatCount() + 1 ;
+    size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );
@@ -341,12 +345,12 @@ bool wxClipboard::GetData( wxDataObject& data )
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;
-          if ( m_data->IsSupported( format ) ) 
+          if ( m_data->IsSupported( format ) )
           {
             int size = m_data->GetDataSize( format );
             transferred = true ;
 
-            if (size == 0) 
+            if (size == 0)
             {
               data.SetData(format , 0 , 0 ) ;
             }
@@ -361,7 +365,7 @@ bool wxClipboard::GetData( wxDataObject& data )
        }
     }
     /* get formats from wxDataObjects */
-    if ( !transferred ) 
+    if ( !transferred )
     {
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
@@ -369,8 +373,10 @@ bool wxClipboard::GetData( wxDataObject& data )
 
           switch ( format.GetType() )
           {
-              case wxDF_TEXT:
-              case wxDF_OEMTEXT:
+              case wxDF_TEXT :
+              case wxDF_OEMTEXT :
+              case wxDF_BITMAP :
+              case wxDF_METAFILE :
               {
                   long len ;
                   char* s = (char*)wxGetClipboardData(format, &len );
@@ -382,6 +388,8 @@ bool wxClipboard::GetData( wxDataObject& data )
                     transferred = true ;
                   }
               }
+                            break ;
+
               default :
                 break ;
           }