mac paths updated

[wxWidgets.git] / src / gtk / dataobj.cpp

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 2111b237e8608827d8164af84eee2011c16c72e8..d0a49bf29a5740e957d0562353b05c3e951cf223 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/gtk/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,22 +7,23 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dataobj.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_DATAOBJ
+

 #include "wx/dataobj.h"
 #include "wx/dataobj.h"

-#include "wx/app.h"
-#include "wx/debug.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/image.h"
+#endif
+

 #include "wx/mstream.h"
 #include "wx/mstream.h"

-#include "wx/image.h"
-#include "wx/log.h"
-#include "wx/url.h"
+#include "wx/uri.h"

 
 

-#include <gdk/gdk.h>
+#include "wx/gtk/private.h"

 
 //-------------------------------------------------------------------------
 // global data
 
 //-------------------------------------------------------------------------
 // global data


@@ -57,13 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )

 {
     PrepareFormats();
     SetId( id );
 {
     PrepareFormats();
     SetId( id );


@@ -78,9 +73,9 @@ wxDataFormat::wxDataFormat( NativeFormat format )
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();

-    
+

     m_type = type;
     m_type = type;

-    
+

 #if wxUSE_UNICODE
     if (m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;
 #if wxUSE_UNICODE
     if (m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;


@@ -109,8 +104,8 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) );
-    return ret;
+    wxGtkString atom_name(gdk_atom_name(m_format));
+    return wxString::FromAscii(atom_name);

 }
 
 void wxDataFormat::SetId( NativeFormat format )
 }
 
 void wxDataFormat::SetId( NativeFormat format )


@@ -137,12 +132,11 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );
-    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); 
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );

 }
 
 void wxDataFormat::PrepareFormats()
 }
 
 void wxDataFormat::PrepareFormats()


@@ -155,12 +149,14 @@ void wxDataFormat::PrepareFormats()
     //     text/uri-list for file dnd because compatibility is not important
     //     here (with whom?)
     if (!g_textAtom)
     //     text/uri-list for file dnd because compatibility is not important
     //     here (with whom?)
     if (!g_textAtom)

+    {

 #if wxUSE_UNICODE
         g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
         g_altTextAtom = gdk_atom_intern( "STRING", FALSE );
 #else
         g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
 #endif
 #if wxUSE_UNICODE
         g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
         g_altTextAtom = gdk_atom_intern( "STRING", FALSE );
 #else
         g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
 #endif

+    }

     if (!g_pngAtom)
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)
     if (!g_pngAtom)
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)


@@ -183,17 +179,17 @@ wxDataObject::~wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);

-    if ( nFormatCount == 1 ) 
+    if ( nFormatCount == 1 )

     {
         return format == GetPreferredFormat();
     }
     {
         return format == GetPreferredFormat();
     }

-    else 
+    else

     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;

-        for ( n = 0; n < nFormatCount; n++ ) 
+        for ( n = 0; n < nFormatCount; n++ )

         {
             if ( formats[n] == format )
                 break;
         {
             if ( formats[n] == format )
                 break;


@@ -210,13 +206,17 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir)
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 

-#if defined(__WXGTK20__) && wxUSE_UNICODE
-void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const
+#if wxUSE_UNICODE
+
+void
+wxTextDataObject::GetAllFormats(wxDataFormat *formats,
+                                wxDataObjectBase::Direction WXUNUSED(dir)) const

 {
     *formats++ = GetPreferredFormat();
     *formats = g_altTextAtom;
 }
 {
     *formats++ = GetPreferredFormat();
     *formats = g_altTextAtom;
 }

-#endif
+
+#endif // wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 // wxFileDataObject
 
 // ----------------------------------------------------------------------------
 // wxFileDataObject


@@ -233,9 +233,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
         filenames += wxT("\r\n");
     }
 
         filenames += wxT("\r\n");
     }
 

-    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );

 
 

-    return TRUE;
+    return true;

 }
 
 size_t wxFileDataObject::GetDataSize() const
 }
 
 size_t wxFileDataObject::GetDataSize() const


@@ -245,7 +245,7 @@ size_t wxFileDataObject::GetDataSize() const
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
         // This is junk in UTF-8
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
         // This is junk in UTF-8

-        res += m_filenames[i].Len();
+        res += m_filenames[i].length();

         res += 5 + 2; // "file:" (5) + "\r\n" (2)
     }
 
         res += 5 + 2; // "file:" (5) + "\r\n" (2)
     }
 


@@ -254,56 +254,60 @@ size_t wxFileDataObject::GetDataSize() const
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {

+    // we get data in the text/uri-list format, i.e. as a sequence of URIs
+    // (filenames prefixed by "file:") delimited by "\r\n". size includes
+    // the trailing zero (in theory, not for Nautilus in early GNOME
+    // versions).
+    

     m_filenames.Empty();
 
     m_filenames.Empty();
 

-    // we get data in the text/uri-list format, i.e. as a sequence of URIs
-    // (filenames prefixed by "file:") delimited by "\r\n"
-    wxString filename;
-    for ( const char *p = (const char *)buf; ; p++ )
+    const gchar *nexttemp = (const gchar*) buf;
+    for ( ; ; )

     {
     {

-        // 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 )
+        int len = 0;
+        const gchar *temp = nexttemp;
+        for (;;)

         {
         {

-            size_t lenPrefix = 5; // strlen("file:")
-            if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+            if (temp[len] == 0)

             {
             {

-                // sometimes the syntax is "file:filename", sometimes it's
-                // URL-like: "file://filename" - deal with both
-                if ( filename[lenPrefix] == _T('/') &&
-                     filename[lenPrefix + 1] == _T('/') )
+                if (len > 0)

                 {
                 {

-                    // skip the slashes
-                    lenPrefix += 2;
+                    // if an app omits '\r''\n'
+                    nexttemp = temp+len;
+                    break;

                 }
                 }

-
-                AddFile(
-#if wxUSE_URL
-                        wxURL::ConvertFromURI
-#endif // wxUSE_URL
-                            (filename.c_str() + lenPrefix));
-                filename.Empty();
+                    
+                return true;

             }
             }

-            else
+            if (temp[len] == '\r')

             {
             {

-                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
-                           filename.c_str());
-            }
-
-            if ( !*p )
+                if (temp[len+1] == '\n')
+                    nexttemp = temp+len+2;
+                else
+                    nexttemp = temp+len+1;

                 break;
                 break;

-
-            // skip '\r'
-            p++;
+            }
+            len++;

         }
         }

-        else
+        
+        if (len == 0)
+            break;
+        
+        // required to give it a trailing zero
+        gchar *uri = g_strndup( temp, len );
+    
+        gchar *fn = g_filename_from_uri( uri, NULL, NULL );
+        
+        g_free( uri );
+    
+        if (fn)

         {
         {

-            filename += *p;
+            AddFile( wxConvFileName->cMB2WX( fn ) );
+            g_free( fn );

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )


@@ -348,12 +352,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 

-        return FALSE;
+        return false;

     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)


@@ -361,7 +365,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,

-                 FALSE, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+                 false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );

 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);


@@ -372,7 +376,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {

-        return FALSE;
+        return false;

     }
 
     m_bitmap = wxBitmap(image);
     }
 
     m_bitmap = wxBitmap(image);


@@ -400,4 +404,53 @@ void wxBitmapDataObject::DoConvertToPng()
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 

+// ----------------------------------------------------------------------------
+// wxURLDataObject
+// ----------------------------------------------------------------------------
+
+wxURLDataObject::wxURLDataObject(const wxString& url) :
+   wxDataObjectSimple( wxDataFormat( gdk_atom_intern("text/x-moz-url",FALSE) ) )
+{
+   m_url = url;
+}
+
+size_t wxURLDataObject::GetDataSize() const
+{ 
+    if (m_url.empty())
+        return 0;
+        
+    return 2*m_url.Len()+2;
+}
+
+bool wxURLDataObject::GetDataHere(void *buf) const
+{ 
+    if (m_url.empty())
+        return false;
+    
+    wxCSConv conv( "UCS2" );
+    conv.FromWChar( (char*) buf, 2*m_url.Len()+2, m_url.wc_str() );
+    
+    return true;
+}
+
+    // copy data from buffer to our data
+bool wxURLDataObject::SetData(size_t len, const void *buf)
+{ 
+    if (len == 0)
+    {
+        m_url = wxEmptyString;
+        return false;
+    }
+    
+    wxCSConv conv( "UCS2" );
+    wxWCharBuffer res = conv.cMB2WC( (const char*) buf );
+    m_url = res;
+    int pos = m_url.Find( '\n' );
+    if (pos != wxNOT_FOUND)
+        m_url.Remove( pos, m_url.Len() - pos );
+    
+    return true;
+}
+

 
 

+#endif // wxUSE_DATAOBJ