SetType( type );
}
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )
{
PrepareFormats();
SetId( id );
m_format = g_textAtom;
else if (m_type == wxDF_TEXT)
m_format = g_altTextAtom;
-#else
- if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
+#else // !wxUSE_UNICODE
+ // notice that we don't map wxDF_UNICODETEXT to g_textAtom here, this
+ // would lead the code elsewhere to treat data objects with this format as
+ // containing UTF-8 data which is not true
+ if (m_type == wxDF_TEXT)
m_format = g_textAtom;
-#endif
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
else
if (m_type == wxDF_BITMAP)
m_format = g_pngAtom;
{
// 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
+ // use STRING for text selection when transferring 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)
+ {
#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)
// 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;
}
-#endif
+
+#endif // wxUSE_UNICODE
// ----------------------------------------------------------------------------
// wxFileDataObject
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();
- // 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;
}
- // It would probably be nicer to use a GTK or Glib
- // function to unescape the 8-bit strings pointed to
- // by buf, but this does the same in wx code.
- wxString filename_unicode = wxURI::Unescape(filename.c_str() + lenPrefix);
- wxCharBuffer filename_8bit = wxConvISO8859_1.cWX2MB( filename_unicode );
- filename_unicode = wxConvFileName->cMB2WX( filename_8bit );
- AddFile( filename_unicode );
- filename.Empty();
+ return true;
}
- else if ( !filename.empty() )
+ if (temp[len] == '\r')
{
- wxLogDebug(_T("Unsupported URI \"%s\" in wxFileDataObject"),
- filename.c_str());
+ if (temp[len+1] == '\n')
+ nexttemp = temp+len+2;
+ else
+ nexttemp = temp+len+1;
+ break;
}
+ len++;
+ }
- if ( !*p )
- break;
+ if (len == 0)
+ break;
- // skip '\r'
- p++;
- }
- else
+ // 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)
{
- // The string is in ISO-8859-1 according to XDND spec
- filename += *p;
+ AddFile( wxConvFileName->cMB2WX( fn ) );
+ g_free( fn );
}
}
m_bitmap = wxBitmap(image);
- return m_bitmap.Ok();
+ return m_bitmap.IsOk();
}
void wxBitmapDataObject::DoConvertToPng()
{
- if ( !m_bitmap.Ok() )
+ if ( !m_bitmap.IsOk() )
return;
wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
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
projects / wxWidgets.git / blobdiff