X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=8a94c4208cd4b2de0dc10a44c8b22f4ad05865e6;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=f9a059b61caa801b82f935e1ba7daad7eb8d0cbd;hpb=13746b6d8269ccba70d86ce42a00c5797b56393a;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index f9a059b61c..8a94c4208c 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -32,12 +32,10 @@ #include "support/Package.h" #include "support/lassert.h" -#include #include -#include - -using boost::bind; +#include +#include using namespace std; using namespace lyx::support; @@ -92,23 +90,52 @@ BufferList::const_iterator BufferList::end() const void BufferList::release(Buffer * buf) { - LASSERT(buf, /**/); + // We may leak here, but we probably do not need to + // shut down. + LASSERT(buf, return); BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { + Buffer const * parent = buf ? buf->parent() : 0; Buffer * tmp = (*it); - LASSERT(tmp, /**/); bstore.erase(it); + LASSERT(tmp, return); delete tmp; + if (parent) + // If this was a child, update the parent's buffer + // to avoid crashes due to dangling pointers (bug 9979) + parent->updateBuffer(); + } +} + + +Buffer * BufferList::newInternalBuffer(string const & s) +{ + Buffer * const buf = createNewBuffer(s); + if (buf) { + buf->setInternal(true); + binternal.push_back(buf); } + return buf; } -Buffer * BufferList::newBuffer(string const & s, bool const ronly) +Buffer * BufferList::newBuffer(string const & s) { - auto_ptr tmpbuf; + Buffer * const buf = createNewBuffer(s); + if (buf) { + LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); + bstore.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::createNewBuffer(string const & s) +{ + unique_ptr tmpbuf; try { - tmpbuf.reset(new Buffer(s, ronly)); + tmpbuf = make_unique(s); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); @@ -119,12 +146,6 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly) } } tmpbuf->params().useClassDefaults(); - if (tmpbuf->isInternal()) { - binternal.push_back(tmpbuf.get()); - } else { - LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); - bstore.push_back(tmpbuf.get()); - } return tmpbuf.release(); } @@ -136,13 +157,15 @@ void BufferList::closeAll() } -FileNameList const & BufferList::fileNames() const +FileNameList BufferList::fileNames() const { - static FileNameList nvec; - nvec.clear(); - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - boost::bind(&Buffer::fileName, _1)); + FileNameList nvec; + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator end = bstore.end(); + for (; it != end; ++it) { + Buffer * buf = *it; + nvec.push_back(buf->fileName()); + } return nvec; } @@ -173,13 +196,14 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); ++it; Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; return nextbuf; @@ -188,13 +212,14 @@ Buffer * BufferList::next(Buffer const * buf) const Buffer * BufferList::previous(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); return previousbuf; @@ -202,18 +227,21 @@ Buffer * BufferList::previous(Buffer const * buf) const void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, - OutputParams const & runparams) + OutputParams const & runparams_in) { + OutputParams runparams = runparams_in; + runparams.is_child = true; BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) { if (!(*it)->isDepClean(masterTmpDir)) { string writefile = addName(masterTmpDir, (*it)->latexName()); (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir, - runparams, false); + runparams, Buffer::OnlyBody); (*it)->markDepClean(masterTmpDir); } } + runparams.is_child = false; } @@ -226,6 +254,15 @@ void BufferList::emergencyWriteAll() } +void BufferList::invalidateConverterCache() const +{ + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator const en = bstore.end(); + for (; it != en; ++it) + (*it)->params().invalidateConverterCache(); +} + + bool BufferList::exists(FileName const & fname) const { return getBuffer(fname) != 0; @@ -242,26 +279,45 @@ bool BufferList::exists(FileName const & fname) const } -namespace { -struct equivalent_to : public binary_function +bool BufferList::isOthersChild(Buffer * parent, Buffer * child) { - bool operator()(FileName const & x, FileName const & y) const - { return equivalent(x, y); } -}; + LASSERT(parent, return false); + LASSERT(child, return false); + LASSERT(parent->isChild(child), return false); + + // Does child document have a different parent? + Buffer const * parent_ = child->parent(); + if (parent_ && parent_ != parent) + return true; + + for(Buffer * buf : bstore) + if (buf != parent && buf->isChild(child)) + return true; + return false; } -Buffer * BufferList::getBuffer(support::FileName const & fname) const +Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const { // 1) cheap test, using string comparison of file names - BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), - bind(equal_to(), bind(&Buffer::fileName, _1), fname)); - if (it != bstore.end()) - return *it; + for (Buffer * b : bstore) + if (b->fileName() == fname) + return b; // 2) possibly expensive test, using equivalence test of file names - it = find_if(bstore.begin(), bstore.end(), - bind(equivalent_to(), bind(&Buffer::fileName, _1), fname)); - return it != bstore.end() ? (*it) : 0; + for (Buffer * b : bstore) + if (equivalent(b->fileName(), fname)) + return b; + if (internal) { + // 1) cheap test, using string comparison of file names + for (Buffer * b : binternal) + if (b->fileName() == fname) + return b; + // 2) possibly expensive test, using equivalence test of file names + for (Buffer * b : binternal) + if (equivalent(b->fileName(), fname)) + return b; + } + return 0; } @@ -272,18 +328,17 @@ Buffer * BufferList::getBufferFromTmp(string const & s) for (; it < end; ++it) { if (prefixIs(s, (*it)->temppath())) { // check whether the filename matches the master - string const master_name = changeExtension(onlyFilename( - (*it)->absFileName()), ".tex"); + string const master_name = (*it)->latexName(); if (suffixIs(s, master_name)) return *it; // if not, try with the children - vector clist = (*it)->getChildren(); - vector::const_iterator cit = clist.begin(); - vector::const_iterator cend = clist.end(); - for (; cit < cend; ++cit) { + ListOfBuffers clist = (*it)->getDescendents(); + ListOfBuffers::const_iterator cit = clist.begin(); + ListOfBuffers::const_iterator cend = clist.end(); + for (; cit != cend; ++cit) { string const mangled_child_name = DocFileName( changeExtension((*cit)->absFileName(), - ".tex")).mangledFilename(); + ".tex")).mangledFileName(); if (suffixIs(s, mangled_child_name)) return *cit; } @@ -293,18 +348,27 @@ Buffer * BufferList::getBufferFromTmp(string const & s) } -void BufferList::setCurrentAuthor(docstring const & name, docstring const & email) +void BufferList::recordCurrentAuthor(Author const & author) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) - (*it)->params().authors().record(0, Author(name, email)); + (*it)->params().authors().recordCurrentAuthor(author); +} + + +void BufferList::updatePreviews() +{ + BufferStorage::iterator it = bstore.begin(); + BufferStorage::iterator end = bstore.end(); + for (; it != end; ++it) + (*it)->updatePreviews(); } int BufferList::bufferNum(FileName const & fname) const { - FileNameList const & buffers = fileNames(); + FileNameList const buffers(fileNames()); FileNameList::const_iterator cit = find(buffers.begin(), buffers.end(), fname); if (cit == buffers.end()) @@ -313,31 +377,6 @@ int BufferList::bufferNum(FileName const & fname) const } -bool BufferList::releaseChild(Buffer * parent, Buffer * child) -{ - LASSERT(parent, return false); - LASSERT(child, return false); - LASSERT(parent->isChild(child), return false); - - // Child document has a different parent, don't close it. - Buffer const * parent_ = child->parent(); - if (parent_ && parent_ != parent) - return false; - - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) { - Buffer * buf = *it; - if (buf != parent && buf->isChild(child)) { - child->setParent(0); - return false; - } - } - release(child); - return true; -} - - void BufferList::changed(bool update_metrics) const { BufferStorage::const_iterator it = bstore.begin();