X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=8a94c4208cd4b2de0dc10a44c8b22f4ad05865e6;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1bee03276b0cbdcc92230e6eb622e8a2825fff28;hpb=1447a7bf98fb691e9979fd3c7689adba4ed3f421;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index 1bee03276b..8a94c4208c 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -24,17 +24,18 @@ #include "support/ExceptionMessage.h" #include "support/debug.h" +#include "support/FileName.h" +#include "support/FileNameList.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" #include "support/Package.h" -#include +#include "support/lassert.h" #include -#include - -using boost::bind; +#include +#include using namespace std; using namespace lyx::support; @@ -48,6 +49,15 @@ BufferList::BufferList() {} +BufferList::~BufferList() +{ + BufferStorage::iterator it = binternal.begin(); + BufferStorage::iterator end = binternal.end(); + for (; it != end; ++it) + delete (*it); +} + + bool BufferList::empty() const { return bstore.empty(); @@ -80,22 +90,52 @@ BufferList::const_iterator BufferList::end() const void BufferList::release(Buffer * buf) { - BOOST_ASSERT(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); - BOOST_ASSERT(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::newBuffer(string const & s, bool const ronly) +Buffer * BufferList::newInternalBuffer(string const & s) { - auto_ptr tmpbuf; - try { tmpbuf.reset(new Buffer(s, ronly)); + Buffer * const buf = createNewBuffer(s); + if (buf) { + buf->setInternal(true); + binternal.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::newBuffer(string const & s) +{ + 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 = make_unique(s); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); @@ -106,8 +146,6 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly) } } tmpbuf->params().useClassDefaults(); - LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); - bstore.push_back(tmpbuf.get()); return tmpbuf.release(); } @@ -119,12 +157,15 @@ void BufferList::closeAll() } -vector const BufferList::getFileNames() const +FileNameList BufferList::fileNames() const { - vector nvec; - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - boost::bind(&Buffer::absFileName, _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; } @@ -155,149 +196,128 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - BOOST_ASSERT(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); - BOOST_ASSERT(it != bstore.end()); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); ++it; - if (it == bstore.end()) - return bstore.front(); - else - return *it; + Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; + return nextbuf; } Buffer * BufferList::previous(Buffer const * buf) const { - BOOST_ASSERT(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); - BOOST_ASSERT(it != bstore.end()); - if (it == bstore.begin()) - return bstore.back(); - else - return *(it - 1); + 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; } 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; } void BufferList::emergencyWriteAll() { - for_each(bstore.begin(), bstore.end(), - bind(&BufferList::emergencyWrite, this, _1)); + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator const en = bstore.end(); + for (; it != en; ++it) + (*it)->emergencyWrite(); } -void BufferList::emergencyWrite(Buffer * buf) +void BufferList::invalidateConverterCache() const { - // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert - // compare with 0 to avoid pointer/interger comparison - // ::assert(buf != 0); - if (!buf) - return; - - // No need to save if the buffer has not changed. - if (buf->isClean()) - return; - - string const doc = buf->isUnnamed() - ? onlyFilename(buf->absFileName()) : buf->absFileName(); - - lyxerr << to_utf8( - bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc))) - << endl; - - // We try to save three places: - // 1) Same place as document. Unless it is an unnamed doc. - if (!buf->isUnnamed()) { - string s = buf->absFileName(); - s += ".emergency"; - lyxerr << " " << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; - } else { - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; - } - } - - // 2) In HOME directory. - string s = addName(package().home_dir().absFilename(), buf->absFileName()); - s += ".emergency"; - lyxerr << ' ' << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; - } - - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; - - // 3) In "/tmp" directory. - // MakeAbsPath to prepend the current - // drive letter on OS/2 - s = addName(package().temp_dir().absFilename(), buf->absFileName()); - s += ".emergency"; - lyxerr << ' ' << s << endl; - if (buf->writeFile(FileName(s))) { - buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; - } - lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl; + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator const en = bstore.end(); + for (; it != en; ++it) + (*it)->params().invalidateConverterCache(); } -bool BufferList::exists(string const & s) const +bool BufferList::exists(FileName const & fname) const { - return find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::absFileName, _1), - s)) - != bstore.end(); + return getBuffer(fname) != 0; } -bool BufferList::isLoaded(Buffer const * b) const + bool BufferList::isLoaded(Buffer const * b) const { - BOOST_ASSERT(b); + if (!b) + return false; BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); } -Buffer * BufferList::getBuffer(string const & s) +bool BufferList::isOthersChild(Buffer * parent, Buffer * child) { - BufferStorage::iterator it = - find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::absFileName, _1), - s)); + 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; +} - return it != bstore.end() ? (*it) : 0; + +Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const +{ + // 1) cheap test, using string comparison of file names + for (Buffer * b : bstore) + if (b->fileName() == fname) + return b; + // 2) possibly expensive test, using equivalence test of file names + 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; } @@ -305,31 +325,69 @@ Buffer * BufferList::getBufferFromTmp(string const & s) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); - for (; it < end; ++it) - if (prefixIs(s, (*it)->temppath())) - return *it; + for (; it < end; ++it) { + if (prefixIs(s, (*it)->temppath())) { + // check whether the filename matches the master + string const master_name = (*it)->latexName(); + if (suffixIs(s, master_name)) + return *it; + // if not, try with the children + 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(); + if (suffixIs(s, mangled_child_name)) + return *cit; + } + } + } return 0; } -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().recordCurrentAuthor(author); +} + + +void BufferList::updatePreviews() { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) - (*it)->params().authors().record(0, Author(name, email)); + (*it)->updatePreviews(); } -int BufferList::bufferNum(string const & name) const +int BufferList::bufferNum(FileName const & fname) const { - vector buffers = getFileNames(); - vector::const_iterator cit = - find(buffers.begin(), buffers.end(), name); + FileNameList const buffers(fileNames()); + FileNameList::const_iterator cit = + find(buffers.begin(), buffers.end(), fname); if (cit == buffers.end()) return 0; return int(cit - buffers.begin()); } +void BufferList::changed(bool update_metrics) const +{ + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator end = bstore.end(); + for (; it != end; ++it) + (*it)->changed(update_metrics); + it = binternal.begin(); + end = binternal.end(); + for (; it != end; ++it) + (*it)->changed(update_metrics); +} + + } // namespace lyx