X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e0201eaa1e299cb5c37246324464e6e2dce7584..79f585d90388128f9d245f7c92d3013b98b9ed14:/src/gtk1/dataobj.cpp?ds=sidebyside

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 3af8442a63..d591070266 100644
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -17,8 +17,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 
-#include "gdk/gdk.h"
-
+#include <gdk/gdk.h>
 
 //-------------------------------------------------------------------------
 // global data
@@ -26,19 +25,24 @@
 
 GdkAtom  g_textAtom        = 0;
 GdkAtom  g_pngAtom         = 0;
+GdkAtom  g_fileAtom        = 0;
 
 //-------------------------------------------------------------------------
 // wxDataFormat
 //-------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataFormat, wxObject)
-
 wxDataFormat::wxDataFormat()
 {
-    PrepareFormats();
+    // do *not* call PrepareFormats() from here for 2 reasons:
+    //
+    // 1. we will have time to do it later because some other Set function
+    //    must be called before we really need them
+    //
+    // 2. doing so prevents us from declaring global wxDataFormats because
+    //    calling PrepareFormats (and thus gdk_atom_intern) before GDK is
+    //    initialised will result in a crash
     m_type = wxDF_INVALID;
-    m_hasAtom = FALSE;
-    m_atom = (GdkAtom) 0;
+    m_format = (GdkAtom) 0;
 }
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )
@@ -59,65 +63,29 @@ wxDataFormat::wxDataFormat( const wxString &id )
     SetId( id );
 }
 
-wxDataFormat::wxDataFormat( const wxDataFormat &format )
+wxDataFormat::wxDataFormat( NativeFormat format )
 {
     PrepareFormats();
-    m_type = format.GetType();
-    m_id = format.GetId();
-    m_hasAtom = TRUE;
-    m_atom = ((wxDataFormat &)format).GetAtom();    // const_cast
-}
-
-wxDataFormat::wxDataFormat( const GdkAtom atom )
-{
-    PrepareFormats();
-    m_hasAtom = TRUE;
-
-    m_atom = atom;
-
-    if (m_atom == g_textAtom)
-    {
-        m_type = wxDF_TEXT;
-    } else
-    if (m_atom == GDK_TARGET_BITMAP)
-    {
-        m_type = wxDF_BITMAP;
-    } else
-    {
-        m_type = wxDF_PRIVATE;
-	m_id = gdk_atom_name( m_atom );
-
-	if (m_id == _T("file:ALL"))
-	{
-	    m_type = wxDF_FILENAME;
-	}
-    }
+    SetId( format );
 }
 
 void wxDataFormat::SetType( wxDataFormatId type )
 {
+    PrepareFormats();
     m_type = type;
 
     if (m_type == wxDF_TEXT)
-    {
-        m_id = _T("STRING");
-    }
+        m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)
-    {
-        m_id = _T("image/png");
-    }
+        m_format = g_pngAtom;
     else
     if (m_type == wxDF_FILENAME)
-    {
-        m_id = _T("file:ALL");
-    }
+        m_format = g_fileAtom;
     else
     {
-       wxFAIL_MSG( _T("invalid dataformat") );
+       wxFAIL_MSG( wxT("invalid dataformat") );
     }
-
-    m_hasAtom = FALSE;
 }
 
 wxDataFormatId wxDataFormat::GetType() const
@@ -127,394 +95,281 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
-    return m_id;
+    wxString ret( gdk_atom_name( m_format ) );  // this will convert from ascii to Unicode
+    return ret;
 }
 
-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( NativeFormat format )
 {
-    m_type = wxDF_PRIVATE;
-    m_id = id;
-    m_hasAtom = FALSE;
+    PrepareFormats();
+    m_format = format;
+
+    if (m_format == g_textAtom)
+        m_type = wxDF_TEXT;
+    else
+    if (m_format == g_pngAtom)
+        m_type = wxDF_BITMAP;
+    else
+    if (m_format == g_fileAtom)
+        m_type = wxDF_FILENAME;
+    else
+        m_type = wxDF_PRIVATE;
 }
 
-GdkAtom wxDataFormat::GetAtom()
+void wxDataFormat::SetId( const wxChar *id )
 {
-    if (!m_hasAtom)
-    {
-        m_hasAtom = TRUE;
-
-	if (m_type == wxDF_TEXT)
-	{
-            m_atom = g_textAtom;
-        }
-	else
-        if (m_type == wxDF_BITMAP)
-        {
-            m_atom = GDK_TARGET_BITMAP;
-        }
-	else
-        if (m_type == wxDF_PRIVATE)
-        {
-            m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE );
-        }
-	else
-	if (m_type == wxDF_FILENAME)
-	{
-	    m_atom = gdk_atom_intern( "file:ALL", FALSE );
-	}
-	else
-	{
-	    m_hasAtom = FALSE;
-	    m_atom = (GdkAtom) 0;
-	}
-    }
-
-    return m_atom;
+    PrepareFormats();
+    m_type = wxDF_PRIVATE;
+    wxString tmp( id );
+    m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
 }
 
 void wxDataFormat::PrepareFormats()
 {
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
-    if (!g_pngAtom) g_pngAtom = gdk_atom_intern( "image/png", FALSE );
+    // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the
+    //     atoms STRING and file:ALL as the old code was, but normal X apps
+    //     use STRING for text selection when transfering the data via
+    //     clipboard, for example, so do use STRING for now (GNOME apps will
+    //     probably support STRING as well for compatibility anyhow), but use
+    //     text/uri-list for file dnd because compatibility is not important
+    //     here (with whom?)
+    if (!g_textAtom)
+        g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
+    if (!g_pngAtom)
+        g_pngAtom = gdk_atom_intern( "image/png", FALSE );
+    if (!g_fileAtom)
+        g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );
 }
 
 //-------------------------------------------------------------------------
-// wxDataBroker
+// wxDataObject
 //-------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataBroker,wxObject)
-
-wxDataBroker::wxDataBroker()
-{
-    m_dataObjects.DeleteContents(TRUE);
-    m_preferred = 0;
-}
-
-void wxDataBroker::Add( wxDataObject *dataObject, bool preferred )
-{
-    if (preferred) m_preferred = m_dataObjects.GetCount();
-    m_dataObjects.Append( dataObject );
-}
-
-size_t wxDataBroker::GetFormatCount() const
-{
-    return m_dataObjects.GetCount();
-}
-
-wxDataFormatId wxDataBroker::GetPreferredFormat() const
-{
-    wxNode *node = m_dataObjects.Nth( m_preferred );
-
-    wxASSERT( node );
-
-    wxDataObject* data_obj = (wxDataObject*)node->Data();
-
-    return data_obj->GetFormat().GetType();
-}
-
-wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const
+wxDataObject::wxDataObject()
 {
-    wxNode *node = m_dataObjects.Nth( nth );
-
-    wxASSERT( node );
-
-    wxDataObject* data_obj = (wxDataObject*)node->Data();
-
-    return data_obj->GetFormat();
 }
 
-bool wxDataBroker::IsSupportedFormat( wxDataFormat &format ) const
+bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
-    wxNode *node = m_dataObjects.First();
-    while (node)
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 ) 
     {
-        wxDataObject *dobj = (wxDataObject*)node->Data();
-
-	if (dobj->GetFormat().GetAtom() == format.GetAtom())
-	{
-	    return TRUE;
-	}
-
-        node = node->Next();
+        return format == GetPreferredFormat();
     }
-
-    return FALSE;
-}
-
-size_t wxDataBroker::GetSize( wxDataFormat& format ) const
-{
-    wxNode *node = m_dataObjects.First();
-    while (node)
+    else 
     {
-        wxDataObject *dobj = (wxDataObject*)node->Data();
-
-	if (dobj->GetFormat().GetAtom() == format.GetAtom())
-	{
-	    return dobj->GetSize();
-	}
-
-        node = node->Next();
-    }
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats(formats,dir);
 
-    return 0;
-}
-
-void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const
-{
-    wxNode *node = m_dataObjects.First();
-    while (node)
-    {
-        wxDataObject *dobj = (wxDataObject*)node->Data();
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ ) 
+        {
+            if ( formats[n] == format )
+                break;
+        }
 
-	if (dobj->GetFormat().GetAtom() == format.GetAtom())
-	{
-	    dobj->WriteData( dest );
-	}
+        delete [] formats;
 
-        node = node->Next();
+        // found?
+        return n < nFormatCount;
     }
 }
 
-//-------------------------------------------------------------------------
-// wxDataObject
-//-------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject )
-
-wxDataObject::wxDataObject()
-{
-}
-
-wxDataObject::~wxDataObject()
-{
-}
-
-wxDataFormat &wxDataObject::GetFormat()
-{
-    return m_format;
-}
-
-wxDataFormatId wxDataObject::GetFormatType() const
-{
-    return m_format.GetType();
-}
-
-wxString wxDataObject::GetFormatId() const
-{
-    return m_format.GetId();
-}
-
-GdkAtom wxDataObject::GetFormatAtom() const
-{
-    GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom();
-    return ret;
-}
-
 // ----------------------------------------------------------------------------
-// wxTextDataObject
+// wxFileDataObject
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxTextDataObject, wxDataObject )
-
-wxTextDataObject::wxTextDataObject()
+bool wxFileDataObject::GetDataHere(void *buf) const
 {
-    m_format.SetType( wxDF_TEXT );
-}
+    wxString filenames;
 
-wxTextDataObject::wxTextDataObject( const wxString& data )
-{
-    m_format.SetType( wxDF_TEXT );
-
-    m_data = data;
-}
-
-void wxTextDataObject::SetText( const wxString& data )
-{
-    m_data = data;
-}
-
-wxString wxTextDataObject::GetText() const
-{
-    return m_data;
-}
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        filenames += m_filenames[i];
+        filenames += (wxChar) 0;
+    }
 
-void wxTextDataObject::WriteData( void *dest ) const
-{
-    WriteString( m_data, dest );
-}
+    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
-size_t wxTextDataObject::GetSize() const
-{
-    return m_data.Len() + 1;
+    return TRUE;
 }
 
-void wxTextDataObject::WriteString( const wxString &str, void *dest ) const
+size_t wxFileDataObject::GetDataSize() const
 {
-    memcpy( dest, str.mb_str(), str.Len()+1 );
-}
-
-// ----------------------------------------------------------------------------
-// wxFileDataObject
-// ----------------------------------------------------------------------------
+    size_t res = 0;
 
-IMPLEMENT_DYNAMIC_CLASS( wxFileDataObject, wxDataObject )
-
-wxFileDataObject::wxFileDataObject()
-{
-    m_format.SetType( wxDF_FILENAME );
-}
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        res += m_filenames[i].Len();
+        res += 1;
+    }
 
-void wxFileDataObject::AddFile( const wxString &file )
-{
-    m_files += file;
-    m_files += (wxChar)0;
+    return res + 1;
 }
 
-wxString wxFileDataObject::GetFiles() const
+bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {
-    return m_files;
-}
+    // VZ: old format
+#if 0
+    // filenames are stores as a string with #0 as deliminators
+    const char *filenames = (const char*) buf;
+    size_t pos = 0;
+    for(;;)
+    {
+        if (filenames[0] == 0)
+            break;
+        if (pos >= size)
+            break;
+        wxString file( filenames );  // this returns the first file
+        AddFile( file );
+        pos += file.Len()+1;
+        filenames += file.Len()+1;
+    }
+#else // 1
+    m_filenames.Empty();
+
+    // the text/uri-list format is a sequence of URIs (filenames prefixed by
+    // "file:" as far as I see) delimited by "\r\n" of total length size
+    // (I wonder what happens if the file has '\n' in its filename??)
+    wxString filename;
+    for ( const char *p = (const char *)buf; ; p++ )
+    {
+        // some broken programs (testdnd GTK+ sample!) omit the trailing
+        // "\r\n", so check for '\0' explicitly here instead of doing it in
+        // the loop statement to account for it
+        if ( (*p == '\r' && *(p+1) == '\n') || !*p )
+        {
+            size_t lenPrefix = 5; // strlen("file:")
+            if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+            {
+                // sometimes the syntax is "file:filename", sometimes it's
+                // URL-like: "file://filename" - deal with both
+                if ( filename[lenPrefix] == _T('/') &&
+                     filename[lenPrefix + 1] == _T('/') )
+                {
+                    // skip the slashes
+                    lenPrefix += 2;
+                }
+
+                AddFile(filename.c_str() + lenPrefix);
+                filename.Empty();
+            }
+            else
+            {
+                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+                           filename.c_str());
+            }
+
+            if ( !*p )
+                break;
+
+            // skip '\r'
+            p++;
+        }
+        else
+        {
+            filename += *p;
+        }
+    }
+#endif // 0/1
 
-void wxFileDataObject::WriteData( void *dest ) const
-{
-    memcpy( dest, m_files.mbc_str(), GetSize() );
+    return TRUE;
 }
 
-size_t wxFileDataObject::GetSize() const
+void wxFileDataObject::AddFile( const wxString &filename )
 {
-    return m_files.Len() + 1;
+   m_filenames.Add( filename );
 }
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject )
-
 wxBitmapDataObject::wxBitmapDataObject()
 {
-    m_format.SetType( wxDF_BITMAP );
-    m_pngData = (char*)NULL;
-    m_pngSize = 0;
+    Init();
 }
 
 wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap )
+                  : wxBitmapDataObjectBase(bitmap)
 {
-    m_format.SetType( wxDF_BITMAP );
-    m_pngData = (char*)NULL;
-    m_pngSize = 0;
-    m_bitmap = bitmap;
+    Init();
+
     DoConvertToPng();
 }
 
 wxBitmapDataObject::~wxBitmapDataObject()
 {
-    if (m_pngData) delete[] m_pngData;
+    Clear();
 }
 
 void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap )
 {
-    m_bitmap = bitmap;
+    ClearAll();
+
+    wxBitmapDataObjectBase::SetBitmap(bitmap);
+
     DoConvertToPng();
 }
 
-wxBitmap wxBitmapDataObject::GetBitmap() const
+bool wxBitmapDataObject::GetDataHere(void *buf) const
 {
-    return m_bitmap;
-}
+    if ( !m_pngSize )
+    {
+        wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
-void wxBitmapDataObject::WriteData( void *dest ) const
-{
-    WriteBitmap( m_bitmap, dest );
-}
+        return FALSE;
+    }
 
-size_t wxBitmapDataObject::GetSize() const
-{
-    return m_pngSize;
-}
+    memcpy(buf, m_pngData, m_pngSize);
 
-void wxBitmapDataObject::WriteBitmap( const wxBitmap &WXUNUSED(bitmap), void *dest ) const
-{
-//    if (m_bitmap == bitmap)
-        memcpy( dest, m_pngData, m_pngSize );
+    return TRUE;
 }
 
-void wxBitmapDataObject::SetPngData( const char *pngData, size_t pngSize )
+bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 {
-    if (m_pngData) delete[] m_pngData;
-    m_pngData = (char*) NULL;
-    m_pngSize = pngSize;
-    m_pngData = new char[m_pngSize];
-    memcpy( m_pngData, pngData, m_pngSize );
-    
-    wxMemoryInputStream mstream( pngData, pngSize );
+    Clear();
+
+#if wxUSE_LIBPNG
+    m_pngSize = size;
+    m_pngData = malloc(m_pngSize);
+
+    memcpy( m_pngData, buf, m_pngSize );
+
+    wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize );
     wxImage image;
     wxPNGHandler handler;
-    handler.LoadFile( &image, mstream );
+    if ( !handler.LoadFile( &image, mstream ) )
+    {
+        return FALSE;
+    }
+
     m_bitmap = image.ConvertToBitmap();
+
+    return m_bitmap.Ok();
+#else
+    return FALSE;
+#endif
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
-    if (m_pngData) delete[] m_pngData;
-    
+#if wxUSE_LIBPNG
+    if (!m_bitmap.Ok())
+        return;
+
     wxImage image( m_bitmap );
     wxPNGHandler handler;
-    
+
     wxCountingOutputStream count;
     handler.SaveFile( &image, count );
-    m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
-    m_pngData = new char[m_pngSize];
-    
-    wxMemoryOutputStream mstream( m_pngData, m_pngSize );
-    handler.SaveFile( &image, mstream );
-}
 
-// ----------------------------------------------------------------------------
-// wxPrivateDataObject
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
-
-void wxPrivateDataObject::Free()
-{
-    if ( m_data )
-        free(m_data);
-}
-
-wxPrivateDataObject::wxPrivateDataObject()
-{
-    wxString id = _T("application/");
-    id += wxTheApp->GetAppName();
-
-    m_format.SetId( id );
-
-    m_size = 0;
-    m_data = (void *)NULL;
-}
-
-void wxPrivateDataObject::SetData( const void *data, size_t size )
-{
-    Free();
-
-    m_size = size;
-    m_data = malloc(size);
-
-    memcpy( m_data, data, size );
-}
-
-void wxPrivateDataObject::WriteData( void *dest ) const
-{
-    WriteData( m_data, dest );
-}
+    m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
+    m_pngData = malloc(m_pngSize);
 
-size_t wxPrivateDataObject::GetSize() const
-{
-    return m_size;
+    wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
+    handler.SaveFile( &image, mstream );
+#endif
 }
 
-void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
-{
-    memcpy( dest, data, GetSize() );
-}