X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b3d29db08422ea814e58822314fae77329dd42f..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/dataobj.cpp diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index c7d29816cb..77b0e87066 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -126,12 +126,19 @@ void wxDataFormat::SetId( const wxChar *id ) 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 ); + 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( "file:ALL", FALSE ); + g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE ); } //------------------------------------------------------------------------- @@ -197,13 +204,71 @@ size_t wxFileDataObject::GetDataSize() const return res + 1; } -bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) +bool wxFileDataObject::SetData(size_t 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; }