X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15d4b8cdb59c80e3743eb186946e7736b7dbdbc3..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index deedf1062e..e85d76f28e 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -57,6 +57,8 @@ #include "wx/tokenzr.h" #include "wx/iconloc.h" #include "wx/filename.h" +#include "wx/app.h" +#include "wx/apptrait.h" #if wxUSE_LIBGNOMEVFS // Not GUI dependent @@ -66,56 +68,37 @@ // other standard headers #include -// this class extends wxTextFile +// this class is a wxTextFile specialization for dealing with files storing +// various MIME-related information // -// VZ: ??? +// it should be used instead of wxTextFile even if none of its additional +// methods are used just because it handles files with mixed encodings (often +// the case for MIME files which contain strings for different languages) +// correctly, see OnRead() class wxMimeTextFile : public wxTextFile { public: // constructors - wxMimeTextFile () : wxTextFile () {}; - wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) {}; + wxMimeTextFile () : wxTextFile () { } + wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) { } - int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0) + int pIndexOf(const wxString& sSearch, + bool bIncludeComments = false, + int iStart = 0) { - size_t i = iStart; - int nResult = wxNOT_FOUND; - if (i >= GetLineCount()) - return wxNOT_FOUND; - wxString sTest = sSearch; sTest.MakeLower(); - wxString sLine; - - if (bIncludeComments) - { - while ( i < GetLineCount() ) - { - sLine = GetLine(i); - sLine.MakeLower(); - if (sLine.Contains(sTest)) - nResult = (int) i; - - i++; - } - } - else + for(size_t i = iStart; i < GetLineCount(); i++) { - while ( (i < GetLineCount()) ) + wxString sLine = GetLine(i).Trim(false); + if(bIncludeComments || ! sLine.StartsWith(wxT("#"))) { - sLine = GetLine(i); sLine.MakeLower(); - if ( ! sLine.StartsWith(wxT("#"))) - { - if (sLine.Contains(sTest)) - nResult = (int) i; - } - - i++; + if(sLine.StartsWith(sTest)) + return (int)i; } } - - return nResult; + return wxNOT_FOUND; } bool CommentLine(int nIndex) @@ -160,9 +143,6 @@ public: } }; -// in case we're compiling in non-GUI mode -class WXDLLEXPORT wxIcon; - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -278,12 +258,8 @@ static bool IsKnownUnimportantField(const wxString& field); void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, const wxArrayString& dirs) { - wxTextFile textfile(filename); -#if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) ) -#else + wxMimeTextFile textfile(filename); if ( !textfile.Open() ) -#endif return; wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s ---"), @@ -422,7 +398,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename) { - wxTextFile textfile(filename); + wxMimeTextFile textfile(filename); if ( !textfile.Open() ) return; @@ -771,13 +747,14 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, const wxString& filename, const wxArrayString& icondirs) { + wxFileName fullname(dirbase, filename); + wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), + fullname.GetFullPath().c_str()); + wxMimeTextFile file; - if ( !file.Open(dirbase + filename) ) + if ( !file.Open(fullname.GetFullPath()) ) return; - wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), - (dirbase + filename).c_str()); - wxMimeTypeCommands * entry = new wxMimeTypeCommands; wxArrayString sExts; wxString mimetype, mime_desc, strIcon; @@ -908,55 +885,42 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase, const wxString& subdir, const wxArrayString& icondirs) { - wxString dirname = dirbase; - dirname += subdir; - wxDir dir(dirname); - if ( !dir.IsOpened() ) + wxFileName dirname(dirbase, wxEmptyString); + dirname.AppendDir(subdir); + wxDir dir(dirname.GetPath()); + if(! dir.IsOpened()) return; wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s ---"), - dirname.c_str()); - - dirname += wxT('/'); + dirname.GetPath().c_str()); wxString filename; bool cont = dir.GetFirst(&filename, wxT("*.kdelnk"), wxDIR_FILES); - while ( cont ) - { - LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs); - + while(cont) { + LoadKDELinksForMimeSubtype(dirname.GetPath(), subdir, + filename, icondirs); cont = dir.GetNext(&filename); } // new standard for Gnome and KDE cont = dir.GetFirst(&filename, wxT("*.desktop"), wxDIR_FILES); - while ( cont ) - { - LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs); - + while(cont) { + LoadKDELinksForMimeSubtype(dirname.GetPath(), subdir, + filename, icondirs); cont = dir.GetNext(&filename); } } -void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirbase, +void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirname, const wxArrayString& icondirs) { - wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase), - wxT("base directory shouldn't end with a slash") ); - - wxString dirname = dirbase; - dirname << wxT("/mimelnk"); - - if ( !wxDir::Exists(dirname) ) + if(! wxDir::Exists(dirname)) return; wxDir dir(dirname); if ( !dir.IsOpened() ) return; - // we will concatenate it with dir name to get the full path below - dirname += wxT('/'); - wxString subdir; bool cont = dir.GetFirst(&subdir, wxEmptyString, wxDIR_DIRS); while ( cont ) @@ -967,131 +931,328 @@ void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirbase, } } -void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir) +// Read a KDE .desktop file of type 'Application' +void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) { - wxArrayString dirs; - wxArrayString icondirs; + wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), filename.c_str()); - // FIXME: This code is heavily broken. There are three bugs in it: - // 1) it uses only KDEDIR, which is deprecated, instead of using - // list of paths from KDEDIRS and using KDEDIR only if KDEDIRS - // is not set - // 2) it doesn't look into ~/.kde/share/config/kdeglobals where - // user's settings are stored and thus *ignores* user's settings - // instead of respecting them - // 3) it "tries to guess KDEDIR" and "tries a few likely theme - // names", both of which is completely arbitrary; instead, the - // code should give up if KDEDIR(S) is not set and/or the icon - // theme cannot be determined, because it means that the user is - // not using KDE (and thus is not interested in KDE icons anyway) - - // the variable $KDEDIR is set when KDE is running - wxString kdedir = wxGetenv( wxT("KDEDIR") ); - - if (!kdedir.empty()) - { - // $(KDEDIR)/share/config/kdeglobals holds info - // the current icons theme - wxFileName configFile( kdedir, wxEmptyString ); - configFile.AppendDir( wxT("share") ); - configFile.AppendDir( wxT("config") ); - configFile.SetName( wxT("kdeglobals") ); - - wxTextFile config; - if (configFile.FileExists() && config.Open(configFile.GetFullPath())) - { - // $(KDEDIR)/share/config -> $(KDEDIR)/share - configFile.RemoveDir( configFile.GetDirCount() - 1 ); - // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons - configFile.AppendDir( wxT("icons") ); - - // Check for entry - wxString theme(wxT("default.kde")); - size_t nCount = config.GetLineCount(); - for (size_t i = 0; i < nCount; i++) - { - if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/)) - break; - } + wxMimeTextFile file; + if ( !file.Open(filename) ) + return; - configFile.AppendDir(theme); - } - else - { - // $(KDEDIR)/share/config -> $(KDEDIR)/share - configFile.RemoveDir( configFile.GetDirCount() - 1 ); + // Here, only type 'Application' should be considered. + int nIndex = file.pIndexOf( wxT("Type=") ); + if (nIndex != wxNOT_FOUND && + file.GetCmd(nIndex).Lower() != wxT("application")) + return; - // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons - configFile.AppendDir( wxT("icons") ); + // The hidden entry specifies a file to be ignored. + nIndex = file.pIndexOf( wxT("Hidden=") ); + if (nIndex != wxNOT_FOUND && file.GetCmd(nIndex).Lower() == wxT("true")) + return; - // $(KDEDIR)/share/icons -> $(KDEDIR)/share/icons/default.kde - configFile.AppendDir( wxT("default.kde") ); + // Semicolon separated list of mime types handled by the application. + nIndex = file.pIndexOf( wxT("MimeType=") ); + if (nIndex == wxNOT_FOUND) + return; + wxString mimetypes = file.GetCmd (nIndex); + + // Name of the application + wxString nameapp; + nIndex = wxNOT_FOUND; +#if wxUSE_INTL // try "Name[locale name]" first + wxLocale *locale = wxGetLocale(); + if ( locale ) + nIndex = file.pIndexOf(_T("Name[")+locale->GetName()+_T("]=")); +#endif // wxUSE_INTL + if(nIndex == wxNOT_FOUND) + nIndex = file.pIndexOf( wxT("Name=") ); + if(nIndex != wxNOT_FOUND) + nameapp = file.GetCmd(nIndex); + + // Icon of the application. + wxString nameicon, namemini; + nIndex = wxNOT_FOUND; +#if wxUSE_INTL // try "Icon[locale name]" first + if ( locale ) + nIndex = file.pIndexOf(_T("Icon[")+locale->GetName()+_T("]=")); +#endif // wxUSE_INTL + if(nIndex == wxNOT_FOUND) + nIndex = file.pIndexOf( wxT("Icon=") ); + if(nIndex != wxNOT_FOUND) { + nameicon = wxString(wxT("--icon ")) + file.GetCmd(nIndex); + namemini = wxString(wxT("--miniicon ")) + file.GetCmd(nIndex); + } + + // Replace some of the field code in the 'Exec' entry. + // TODO: deal with %d, %D, %n, %N, %k and %v (but last one is deprecated) + nIndex = file.pIndexOf( wxT("Exec=") ); + if (nIndex == wxNOT_FOUND) + return; + wxString sCmd = file.GetCmd(nIndex); + // we expect %f; others including %F and %U and %u are possible + sCmd.Replace(wxT("%F"), wxT("%f")); + sCmd.Replace(wxT("%U"), wxT("%f")); + sCmd.Replace(wxT("%u"), wxT("%f")); + if (0 == sCmd.Replace ( wxT("%f"), wxT("%s") )) + sCmd = sCmd + wxT(" %s"); + sCmd.Replace(wxT("%c"), nameapp); + sCmd.Replace(wxT("%i"), nameicon); + sCmd.Replace(wxT("%m"), namemini); + + wxStringTokenizer tokenizer(mimetypes, _T(";")); + while(tokenizer.HasMoreTokens()) { + wxString mimetype = tokenizer.GetNextToken().Lower(); + nIndex = m_aTypes.Index(mimetype); + if(nIndex != wxNOT_FOUND) { // is this a known MIME type? + wxMimeTypeCommands* entry = m_aEntries[nIndex]; + entry->AddOrReplaceVerb(wxT("open"), sCmd); } + } +} - configFile.SetName( wxEmptyString ); - configFile.AppendDir( wxT("32x32") ); - configFile.AppendDir( wxT("mimetypes") ); +void wxMimeTypesManagerImpl::LoadKDEAppsFilesFromDir(const wxString& dirname) +{ + if(! wxDir::Exists(dirname)) + return; + wxDir dir(dirname); + if ( !dir.IsOpened() ) + return; - // Just try a few likely icons theme names + wxString filename; + // Look into .desktop files + bool cont = dir.GetFirst(&filename, _T("*.desktop"), wxDIR_FILES); + while(cont) { + wxFileName p(dirname, filename); + LoadKDEApp( p.GetFullPath() ); + cont = dir.GetNext(&filename); + } + // Look recursively into subdirs + cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); + while(cont) { + wxFileName p(dirname, wxEmptyString); + p.AppendDir(filename); + LoadKDEAppsFilesFromDir( p.GetPath() ); + cont = dir.GetNext(&filename); + } +} - int pos = configFile.GetDirCount() - 3; +// Return base KDE directories. +// 1) Environment variable $KDEHOME, or "~/.kde" if not set. +// 2) List of directories in colon separated environment variable $KDEDIRS. +// 3) Environment variable $KDEDIR in case $KDEDIRS is not set. +// Notice at least the local kde directory is added to the list. If it is the +// only one, use later the application 'kde-config' to get additional paths. +static void GetKDEBaseDirs(wxArrayString& basedirs) +{ + wxString env = wxGetenv( wxT("KDEHOME") ); + if(env.IsEmpty()) + env = wxGetHomeDir() + wxT("/.kde"); + basedirs.Add(env); + + env = wxGetenv( wxT("KDEDIRS") ); + if(env.IsEmpty()) { + env = wxGetenv( wxT("KDEDIR") ); + if(! env.IsEmpty()) + basedirs.Add(env); + } else { + wxStringTokenizer tokenizer(env, wxT(":")); + while(tokenizer.HasMoreTokens()) + basedirs.Add( tokenizer.GetNextToken() ); + } +} - if (!wxDir::Exists(configFile.GetPath())) - { - configFile.RemoveDir( pos ); - configFile.InsertDir( pos, wxT("default.kde") ); - } +static wxString ReadPathFromKDEConfig(const wxString& request) +{ + wxString str; + wxArrayString output; + if(wxExecute(wxT("kde-config --path ")+request, output) == 0 && + output.GetCount() > 0) + str = output.Item(0); + return str; +} - if (!wxDir::Exists(configFile.GetPath())) +// Try to find the "Theme" entry in the configuration file, provided it exists. +static wxString GetKDEThemeInFile(const wxFileName& filename) +{ + wxString theme; + wxMimeTextFile config; + if ( filename.FileExists() && config.Open(filename.GetFullPath()) ) + { + size_t cnt = config.GetLineCount(); + for ( size_t i = 0; i < cnt; i++ ) { - configFile.RemoveDir( pos ); - configFile.InsertDir( pos, wxT("default") ); + if ( config[i].StartsWith(wxT("Theme="), &theme) ) + break; } + } - if (!wxDir::Exists(configFile.GetPath())) - { - configFile.RemoveDir( pos ); - configFile.InsertDir( pos, wxT("crystalsvg") ); - } + return theme; +} - if (!wxDir::Exists(configFile.GetPath())) - { - configFile.RemoveDir( pos ); - configFile.InsertDir( pos, wxT("crystal") ); +// Try to find a file "kdeglobals" in one of the directories and read the +// "Theme" entry there. +static wxString GetKDETheme(const wxArrayString& basedirs) +{ + wxString theme; + for(size_t i = 0; i < basedirs.GetCount(); i++) { + wxFileName filename(basedirs.Item(i), wxEmptyString); + filename.AppendDir( wxT("share") ); + filename.AppendDir( wxT("config") ); + filename.SetName( wxT("kdeglobals") ); + theme = GetKDEThemeInFile(filename); + if(! theme.IsEmpty()) + return theme; + } + // If $KDEDIRS and $KDEDIR were set, we try nothing more. Otherwise, we + // try to get the configuration file with 'kde-config'. + if(basedirs.GetCount() > 1) + return theme; + wxString paths = ReadPathFromKDEConfig(wxT("config")); + if(! paths.IsEmpty()) { + wxStringTokenizer tokenizer(paths, wxT(":")); + while( tokenizer.HasMoreTokens() ) { + wxFileName filename(tokenizer.GetNextToken(), wxT("kdeglobals")); + theme = GetKDEThemeInFile(filename); + if(! theme.IsEmpty()) + return theme; + } + } + return theme; +} + +// Get list of directories of icons. +static void GetKDEIconDirs(const wxArrayString& basedirs, + wxArrayString& icondirs) +{ + wxString theme = GetKDETheme(basedirs); + if(theme.IsEmpty()) + theme = wxT("default.kde"); + + for(size_t i = 0; i < basedirs.GetCount(); i++) { + wxFileName dirname(basedirs.Item(i), wxEmptyString); + dirname.AppendDir( wxT("share") ); + dirname.AppendDir( wxT("icons") ); + dirname.AppendDir(theme); + dirname.AppendDir( wxT("32x32") ); + dirname.AppendDir( wxT("mimetypes") ); + if( wxDir::Exists( dirname.GetPath() ) ) + icondirs.Add( dirname.GetPath() ); + } + + // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' + if(basedirs.GetCount() > 1) + return; + wxString paths = ReadPathFromKDEConfig(wxT("icon")); + if(! paths.IsEmpty()) { + wxStringTokenizer tokenizer(paths, wxT(":")); + while( tokenizer.HasMoreTokens() ) { + wxFileName dirname(tokenizer.GetNextToken(), wxEmptyString); + dirname.AppendDir(theme); + dirname.AppendDir( wxT("32x32") ); + dirname.AppendDir( wxT("mimetypes") ); + if(icondirs.Index(dirname.GetPath()) == wxNOT_FOUND && + wxDir::Exists( dirname.GetPath() ) ) + icondirs.Add( dirname.GetPath() ); } + } +} - if (wxDir::Exists(configFile.GetPath())) - icondirs.Add( configFile.GetFullPath() ); +// Get list of directories of mime types. +static void GetKDEMimeDirs(const wxArrayString& basedirs, + wxArrayString& mimedirs) +{ + for(size_t i = 0; i < basedirs.GetCount(); i++) { + wxFileName dirname(basedirs.Item(i), wxEmptyString); + dirname.AppendDir( wxT("share") ); + dirname.AppendDir( wxT("mimelnk") ); + if( wxDir::Exists( dirname.GetPath() ) ) + mimedirs.Add( dirname.GetPath() ); } - // settings in ~/.kde have maximal priority - dirs.Add(wxGetHomeDir() + wxT("/.kde/share")); - icondirs.Add(wxGetHomeDir() + wxT("/.kde/share/icons/")); + // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' + if(basedirs.GetCount() > 1) + return; + wxString paths = ReadPathFromKDEConfig(wxT("mime")); + if(! paths.IsEmpty()) { + wxStringTokenizer tokenizer(paths, wxT(":")); + while( tokenizer.HasMoreTokens() ) { + wxFileName p(tokenizer.GetNextToken(), wxEmptyString); + wxString dirname = p.GetPath(); // To remove possible trailing '/' + if(mimedirs.Index(dirname) == wxNOT_FOUND && + wxDir::Exists(dirname) ) + mimedirs.Add(dirname); + } + } +} - if (kdedir) - { - dirs.Add( wxString(kdedir) + wxT("/share") ); - icondirs.Add( wxString(kdedir) + wxT("/share/icons/") ); +// Get list of directories of application desktop files. +static void GetKDEAppsDirs(const wxArrayString& basedirs, + wxArrayString& appsdirs) +{ + for(size_t i = 0; i < basedirs.GetCount(); i++) { + wxFileName dirname(basedirs.Item(i), wxEmptyString); + dirname.AppendDir( wxT("share") ); + dirname.AppendDir( wxT("applnk") ); + if( wxDir::Exists( dirname.GetPath() ) ) + appsdirs.Add( dirname.GetPath() ); } - else - { - // try to guess KDEDIR - dirs.Add(wxT("/usr/share")); - dirs.Add(wxT("/opt/kde/share")); - icondirs.Add(wxT("/usr/share/icons/")); - icondirs.Add(wxT("/usr/X11R6/share/icons/")); // Debian/Corel linux - icondirs.Add(wxT("/opt/kde/share/icons/")); + + // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' + if(basedirs.GetCount() > 1) + return; + wxString paths = ReadPathFromKDEConfig(wxT("apps")); + if(! paths.IsEmpty()) { + wxStringTokenizer tokenizer(paths, wxT(":")); + while( tokenizer.HasMoreTokens() ) { + wxFileName p(tokenizer.GetNextToken(), wxEmptyString); + wxString dirname = p.GetPath(); // To remove possible trailing '/' + if(appsdirs.Index(dirname) == wxNOT_FOUND && + wxDir::Exists(dirname) ) + appsdirs.Add(dirname); + } + } + paths = ReadPathFromKDEConfig(wxT("xdgdata-apps")); + if(! paths.IsEmpty()) { + wxStringTokenizer tokenizer(paths, wxT(":")); + while( tokenizer.HasMoreTokens() ) { + wxFileName p(tokenizer.GetNextToken(), wxEmptyString); + wxString dirname = p.GetPath(); // To remove possible trailing '/' + if(appsdirs.Index(dirname) == wxNOT_FOUND && + wxDir::Exists(dirname) ) + appsdirs.Add(dirname); + } } +} - if (!sExtraDir.empty()) - dirs.Add(sExtraDir); - icondirs.Add(sExtraDir + wxT("/icons")); +// Fill database with all mime types. +void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir) +{ + wxArrayString basedirs; + GetKDEBaseDirs(basedirs); - size_t nDirs = dirs.GetCount(); - for ( size_t nDir = 0; nDir < nDirs; nDir++ ) - { - LoadKDELinkFilesFromDir(dirs[nDir], icondirs); - } + wxArrayString icondirs; + GetKDEIconDirs(basedirs, icondirs); + wxArrayString mimedirs; + GetKDEMimeDirs(basedirs, mimedirs); + wxArrayString appsdirs; + GetKDEAppsDirs(basedirs, appsdirs); + + if(! sExtraDir.IsEmpty()) { + icondirs.Add(sExtraDir + wxT("/icons")); + mimedirs.Add(sExtraDir + wxT("/mimelnk")); + appsdirs.Add(sExtraDir + wxT("/applnk")); + } + + // Load mime types + size_t nDirs = mimedirs.GetCount(), nDir; + for(nDir = 0; nDir < nDirs; nDir++) + LoadKDELinkFilesFromDir(mimedirs[nDir], icondirs); + + // Load application files and associate them to corresponding mime types. + nDirs = appsdirs.GetCount(); + for(nDir = 0; nDir < nDirs; nDir++) + LoadKDEAppsFilesFromDir(appsdirs[nDir]); } // ---------------------------------------------------------------------------- @@ -1190,14 +1351,15 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - wxString strExtensions = m_manager->GetExtension(m_index[0]); + const wxString strExtensions = m_manager->GetExtension(m_index[0]); extensions.Empty(); // one extension in the space or comma-delimited list wxString strExt; - for ( const wxChar *p = strExtensions; /* nothing */; p++ ) + wxString::const_iterator end = strExtensions.end(); + for ( wxString::const_iterator p = strExtensions.begin(); /* nothing */; ++p ) { - if ( *p == wxT(' ') || *p == wxT(',') || *p == wxT('\0') ) + if ( p == end || *p == wxT(' ') || *p == wxT(',') ) { if ( !strExt.empty() ) { @@ -1207,7 +1369,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) //else: repeated spaces // (shouldn't happen, but it's not that important if it does happen) - if ( *p == wxT('\0') ) + if ( p == end ) break; } else if ( *p == wxT('.') ) @@ -1248,14 +1410,27 @@ wxFileTypeImpl::SetCommand(const wxString& cmd, wxMimeTypeCommands *entry = new wxMimeTypeCommands(); entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); - bool ok = true; + bool ok = false; size_t nCount = strTypes.GetCount(); for ( size_t i = 0; i < nCount; i++ ) { - if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) - ok = false; + if ( m_manager->DoAssociation + ( + strTypes[i], + strIcon, + entry, + strExtensions, + strDesc + ) ) + { + // DoAssociation() took ownership of entry, don't delete it below + ok = true; + } } + if ( !ok ) + delete entry; + return ok; } @@ -1274,23 +1449,28 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index) return false; wxMimeTypeCommands *entry = new wxMimeTypeCommands(); - bool ok = true; + bool ok = false; size_t nCount = strTypes.GetCount(); for ( size_t i = 0; i < nCount; i++ ) { - if ( !m_manager->DoAssociation - ( + if ( m_manager->DoAssociation + ( strTypes[i], strIcon, entry, strExtensions, strDesc - ) ) + ) ) { - ok = false; + // we don't need to free entry now, DoAssociation() took ownership + // of it + ok = true; } } + if ( !ok ) + delete entry; + return ok; } @@ -1310,15 +1490,15 @@ void wxMimeTypesManagerImpl::InitIfNeeded() { // set the flag first to prevent recursion m_initialized = true; - - const wxString &wm = wxGetenv( wxT("WINDOWMANAGER") ); - - if (wm.Find( wxT("kde") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_KDE ); - else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_GNOME ); - else - Initialize(); + + wxString wm = wxTheApp->GetTraits()->GetDesktopEnvironment(); + + if (wm == wxT("KDE")) + Initialize( wxMAILCAP_KDE ); + else if (wm == wxT("GNOME")) + Initialize( wxMAILCAP_GNOME ); + else + Initialize(); } } @@ -1335,9 +1515,11 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, if (mailcapStyles & wxMAILCAP_GNOME) GetGnomeMimeInfo(sExtraDir); - // read KDE tables + // read KDE tables which are never installed on OpenVMS +#ifndef __VMS if (mailcapStyles & wxMAILCAP_KDE) GetKDEMimeInfo(sExtraDir); +#endif m_mailcapStylesInited |= mailcapStyles; } @@ -1904,10 +2086,10 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, } // check data integrity - wxASSERT( m_aTypes.Count() == m_aEntries.Count() && - m_aTypes.Count() == m_aExtensions.Count() && - m_aTypes.Count() == m_aIcons.Count() && - m_aTypes.Count() == m_aDescriptions.Count() ); + wxASSERT( m_aTypes.GetCount() == m_aEntries.GetCount() && + m_aTypes.GetCount() == m_aExtensions.GetCount() && + m_aTypes.GetCount() == m_aIcons.GetCount() && + m_aTypes.GetCount() == m_aDescriptions.GetCount() ); return nIndex; } @@ -1965,7 +2147,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mim index = wxNOT_FOUND; wxString strCategory = mimetype.BeforeFirst(wxT('/')); - size_t nCount = m_aTypes.Count(); + size_t nCount = m_aTypes.GetCount(); for ( size_t n = 0; n < nCount; n++ ) { if ( (m_aTypes[n].BeforeFirst(wxT('/')) == strCategory ) && @@ -2079,12 +2261,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) wxLogTrace(TRACE_MIME, wxT("--- Parsing mime.types file '%s' ---"), strFileName.c_str()); - wxTextFile file(strFileName); -#if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !file.Open(wxConvUTF8) ) -#else + wxMimeTextFile file(strFileName); if ( !file.Open() ) -#endif return false; // the information we extract @@ -2295,8 +2473,7 @@ wxMimeTypesManagerImpl::ProcessOtherMailcapField(MailcapLineData& data, } // is this something of the form foo=bar? - const wxChar *pEq = wxStrchr(curField, wxT('=')); - if ( pEq != NULL ) + if ( curField.find('=') != wxString::npos ) { // split "LHS = RHS" in 2 wxString lhs = curField.BeforeFirst(wxT('=')), @@ -2376,12 +2553,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, wxLogTrace(TRACE_MIME, wxT("--- Parsing mailcap file '%s' ---"), strFileName.c_str()); - wxTextFile file(strFileName); -#if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !file.Open(wxConvUTF8) ) -#else + wxMimeTextFile file(strFileName); if ( !file.Open() ) -#endif return false; // indices of MIME types (in m_aTypes) we already found in this file @@ -2424,8 +2597,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, Field_Type, Field_OpenCmd, Field_Other - } - currentToken = Field_Type; + } currentToken = Field_Type; // the flags and field values on the current line MailcapLineData data; @@ -2576,8 +2748,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, if ( data.needsterminal ) { - data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"), - data.cmdOpen.c_str()); + data.cmdOpen.insert(0, wxT("xterm -e sh -c '")); + data.cmdOpen.append(wxT("'")); } if ( !data.cmdOpen.empty() ) @@ -2682,10 +2854,10 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) } } // check data integrity - wxASSERT( m_aTypes.Count() == m_aEntries.Count() && - m_aTypes.Count() == m_aExtensions.Count() && - m_aTypes.Count() == m_aIcons.Count() && - m_aTypes.Count() == m_aDescriptions.Count() ); + wxASSERT( m_aTypes.GetCount() == m_aEntries.GetCount() && + m_aTypes.GetCount() == m_aExtensions.GetCount() && + m_aTypes.GetCount() == m_aIcons.GetCount() && + m_aTypes.GetCount() == m_aDescriptions.GetCount() ); return true; }