compositing and transition changes

[wxWidgets.git] / src / mac / carbon / clipbrd.cpp

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 76952a442ea69563a1ef6d3b690b604b7e289a17..91fc234410384e084ad26ce91b56f7f0d7008f5c 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -1,16 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.cpp
 // Purpose:     Clipboard functionality
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clipbrd.cpp
 // Purpose:     Clipboard functionality

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation

 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 


@@ -23,10 +22,10 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 

-#include "wx/mac/private.h"

 #ifndef __DARWIN__
 #include <Scrap.h>
 #endif
 #ifndef __DARWIN__
 #include <Scrap.h>
 #endif

+#include "wx/mac/uma.h"

 
 #define wxUSE_DATAOBJ 1
 
 
 #define wxUSE_DATAOBJ 1
 


@@ -44,55 +43,66 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 #else
     OSStatus err = noErr ;
 #endif
 #else
     OSStatus err = noErr ;
 #endif

-  void * data = NULL ;
-    
+    void * data = NULL ;
+    Size byteCount;
+

     switch (dataFormat.GetType())
     {
     switch (dataFormat.GetType())
     {

-        case wxDF_OEMTEXT:
-            dataFormat = wxDF_TEXT;
-            // fall through
-
-        case wxDF_TEXT:
-                break;
-        default:
-            {
-                wxLogError(_("Unsupported clipboard format."));
-                return NULL;
-            }
+    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;
     }
 
 #if TARGET_CARBON
     ScrapRef scrapRef;

-    
+

     err = GetCurrentScrap( &scrapRef );
     err = GetCurrentScrap( &scrapRef );

-    if ( err != noTypeErr && err != memFullErr )    
+    if ( err != noTypeErr && err != memFullErr )

     {
         ScrapFlavorFlags    flavorFlags;
     {
         ScrapFlavorFlags    flavorFlags;

-        Size                byteCount;
-        
+

         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
         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 ;
-          }
+                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 ;
+                }

             }
         }
     }
             }
         }
     }

-    
+

 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;
 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;


@@ -101,16 +111,21 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     HUnlock( datahandle ) ;
     if ( GetHandleSize( datahandle ) > 0 )
     {
     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 ;
+        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
     }
     DisposeHandle( datahandle ) ;
 #endif


@@ -120,10 +135,12 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
         return NULL ;
     }
 
         return NULL ;
     }

-    if ( dataFormat.GetType() == wxDF_TEXT && wxApp::s_macDefaultEncodingIsPC )
+
+    if ( dataFormat.GetType() == wxDF_TEXT )

     {
     {

-      wxMacConvertToPC((char*)data) ;
+        wxMacConvertNewlines10To13( (char*) data ) ;

     }
     }

+

     return data;
 }
 
     return data;
 }
 


@@ -136,8 +153,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-  m_open = false ;
-  m_data = NULL ;
+    m_open = false ;
+    m_data = NULL ;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -188,12 +205,8 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
-
-    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 );
 }
 
     return AddData( data );
 }
 


@@ -228,55 +241,49 @@ bool wxClipboard::AddData( wxDataObject *data )
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:
        {
            case wxDF_TEXT:
            case wxDF_OEMTEXT:

+           {
+               wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+               wxCharBuffer buf = textDataObject->GetText().mb_str() ;
+               err = UMAPutScrap( strlen(buf) , kScrapFlavorTypeText , (void*) buf.data()  ) ;
+           }
+           break ;
+#if wxUSE_UNICODE
+           case wxDF_UNICODETEXT :

            {
                wxTextDataObject* textDataObject = (wxTextDataObject*) data;
                wxString str(textDataObject->GetText());
            {
                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
+               err = UMAPutScrap( str.Length() * sizeof(wxChar) , kScrapFlavorTypeUnicode , (void*) str.wc_str()  ) ;

            }
            break ;
            }
            break ;

-
+#endif

 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {
 #if wxUSE_DRAG_AND_DROP
         case wxDF_METAFILE:
            {

-              wxMetafileDataObject* metaFileDataObject =
+                wxMetafileDataObject* metaFileDataObject =

                 (wxMetafileDataObject*) data;
                 (wxMetafileDataObject*) data;

-              wxMetafile metaFile = metaFileDataObject->GetMetafile();
-                    PicHandle pict = (PicHandle) 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 ) ;
+                  wxMetafile metaFile = metaFileDataObject->GetMetafile();
+                PicHandle pict = (PicHandle) metaFile.GetHMETAFILE() ;
+                  HLock( (Handle) pict ) ;
+                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;
+                  HUnlock(  (Handle) pict ) ;

            }
            break ;
 #endif
            case wxDF_BITMAP:
            case wxDF_DIB:
            }
            break ;
 #endif
            case wxDF_BITMAP:
            case wxDF_DIB:

+           {
+                   bool created = false ;
+                   PicHandle pict = NULL ;
+
+                   wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data ;
+                   pict = (PicHandle) bitmapDataObject->GetBitmap().GetPict( &created ) ;
+
+                  HLock( (Handle) pict ) ;
+                  err = UMAPutScrap( GetHandleSize(  (Handle) pict ) , kScrapFlavorTypePicture , *pict ) ;
+                  HUnlock(  (Handle) pict ) ;
+                  if ( created )
+                      KillPicture( pict ) ;
+           }

            default:
                 break ;
        }
            default:
                 break ;
        }


@@ -302,13 +309,13 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;

-    
+

     err = GetCurrentScrap( &scrapRef );
     err = GetCurrentScrap( &scrapRef );

-    if ( err != noTypeErr && err != memFullErr )    
+    if ( err != noTypeErr && err != memFullErr )

     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;
     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;

-        
+

         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
         if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)


@@ -318,7 +325,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-    
+

 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;
 #else
     long offset ;
     Handle datahandle = NewHandle(0) ;


@@ -347,12 +354,12 @@ bool wxClipboard::GetData( wxDataObject& data )
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;
       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 ;
 
           {
             int size = m_data->GetDataSize( format );
             transferred = true ;
 

-            if (size == 0) 
+            if (size == 0)

             {
               data.SetData(format , 0 , 0 ) ;
             }
             {
               data.SetData(format , 0 , 0 ) ;
             }


@@ -367,7 +374,7 @@ bool wxClipboard::GetData( wxDataObject& data )
        }
     }
     /* get formats from wxDataObjects */
        }
     }
     /* get formats from wxDataObjects */

-    if ( !transferred ) 
+    if ( !transferred )

     {
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
     {
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {


@@ -375,8 +382,10 @@ bool wxClipboard::GetData( wxDataObject& data )
 
           switch ( format.GetType() )
           {
 
           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 );
               {
                   long len ;
                   char* s = (char*)wxGetClipboardData(format, &len );


@@ -388,7 +397,7 @@ bool wxClipboard::GetData( wxDataObject& data )
                     transferred = true ;
                   }
               }
                     transferred = true ;
                   }
               }

-                                                       break ;
+                            break ;

 
               default :
                 break ;
 
               default :
                 break ;