X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b3d29db08422ea814e58822314fae77329dd42f..d2ebf0b7303be387d2d5a55ea0cd672fdf0c4f25:/src/gtk1/dataobj.cpp diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index c7d29816cb..0602e78037 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -7,23 +7,28 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dataobj.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/dataobj.h" #include "wx/app.h" #include "wx/debug.h" #include "wx/mstream.h" #include "wx/image.h" +#include "wx/log.h" -#include "gdk/gdk.h" +#include //------------------------------------------------------------------------- // global data //------------------------------------------------------------------------- GdkAtom g_textAtom = 0; +GdkAtom g_altTextAtom = 0; GdkAtom g_pngAtom = 0; GdkAtom g_fileAtom = 0; @@ -72,10 +77,18 @@ wxDataFormat::wxDataFormat( NativeFormat format ) void wxDataFormat::SetType( wxDataFormatId type ) { PrepareFormats(); + m_type = type; - - if (m_type == wxDF_TEXT) + +#if wxUSE_UNICODE + if (m_type == wxDF_UNICODETEXT) m_format = g_textAtom; + else if (m_type == wxDF_TEXT) + m_format = g_altTextAtom; +#else + if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT) + m_format = g_textAtom; +#endif else if (m_type == wxDF_BITMAP) m_format = g_pngAtom; @@ -95,7 +108,7 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - wxString ret( gdk_atom_name( m_format ) ); // this will convert from ascii to Unicode + wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) ); return ret; } @@ -105,6 +118,13 @@ void wxDataFormat::SetId( NativeFormat format ) m_format = format; if (m_format == g_textAtom) +#if wxUSE_UNICODE + m_type = wxDF_UNICODETEXT; +#else + m_type = wxDF_TEXT; +#endif + else + if (m_format == g_altTextAtom) m_type = wxDF_TEXT; else if (m_format == g_pngAtom) @@ -121,17 +141,29 @@ void wxDataFormat::SetId( const wxChar *id ) PrepareFormats(); m_type = wxDF_PRIVATE; wxString tmp( id ); - m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for? + m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); } void wxDataFormat::PrepareFormats() { + // 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", FALSE ); +#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) - g_fileAtom = gdk_atom_intern( "file:ALL", FALSE ); + g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE ); } //------------------------------------------------------------------------- @@ -142,18 +174,26 @@ wxDataObject::wxDataObject() { } +wxDataObject::~wxDataObject() +{ + // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link +} + bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const { size_t nFormatCount = GetFormatCount(dir); - if ( nFormatCount == 1 ) { + if ( nFormatCount == 1 ) + { return format == GetPreferredFormat(); } - else { + else + { 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; } @@ -165,6 +205,18 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) } } +// ---------------------------------------------------------------------------- +// wxTextDataObject +// ---------------------------------------------------------------------------- + +#if defined(__WXGTK20__) && wxUSE_UNICODE +void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const +{ + *formats++ = GetPreferredFormat(); + *formats = g_altTextAtom; +} +#endif + // ---------------------------------------------------------------------------- // wxFileDataObject // ---------------------------------------------------------------------------- @@ -175,8 +227,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const for (size_t i = 0; i < m_filenames.GetCount(); i++) { + filenames += wxT("file:"); filenames += m_filenames[i]; - filenames += (wxChar) 0; + filenames += wxT("\r\n"); } memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); @@ -190,8 +243,9 @@ size_t wxFileDataObject::GetDataSize() const for (size_t i = 0; i < m_filenames.GetCount(); i++) { + // This is junk in UTF-8 res += m_filenames[i].Len(); - res += 1; + res += 5 + 2; // "file:" (5) + "\r\n" (2) } return res + 1; @@ -199,11 +253,69 @@ size_t wxFileDataObject::GetDataSize() const bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) { - /* TODO */ - - wxString file( (const char *)buf ); /* char, not wxChar */ + // 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; - AddFile( file ); + // skip '\r' + p++; + } + else + { + filename += *p; + } + } +#endif // 0/1 return TRUE; } @@ -262,40 +374,44 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) { 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!") ); + m_pngSize = size; m_pngData = malloc(m_pngSize); - memcpy( m_pngData, buf, m_pngSize ); + memcpy(m_pngData, buf, m_pngSize); - wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize ); + wxMemoryInputStream mstream((char*) m_pngData, m_pngSize); wxImage image; - wxPNGHandler handler; - if ( !handler.LoadFile( &image, mstream ) ) + if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) ) { return FALSE; } - m_bitmap = image.ConvertToBitmap(); + m_bitmap = wxBitmap(image); return m_bitmap.Ok(); } void wxBitmapDataObject::DoConvertToPng() { - if (!m_bitmap.Ok()) + if ( !m_bitmap.Ok() ) return; - wxImage image( m_bitmap ); - wxPNGHandler handler; + wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, + wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); + + wxImage image = m_bitmap.ConvertToImage(); wxCountingOutputStream count; - handler.SaveFile( &image, count ); + image.SaveFile(count, wxBITMAP_TYPE_PNG); m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? m_pngData = malloc(m_pngSize); - wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize ); - handler.SaveFile( &image, mstream ); + wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize); + image.SaveFile(mstream, wxBITMAP_TYPE_PNG); }