X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=0daca0929f6e53bb6b80b81a391fec6583c09778;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=e4f752cd58026327dd9414c076a9edd1296c81e4;hpb=f625dd7ea0770f0f1151401ed90d0ef2146595d7;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index e4f752cd58..0daca0929f 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. */ @@ -15,8 +15,6 @@ #include "Author.h" #include "Buffer.h" #include "BufferParams.h" -#include "debug.h" -#include "gettext.h" #include "Session.h" #include "LyX.h" #include "output_latex.h" @@ -24,40 +22,28 @@ #include "frontends/alert.h" +#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 "support/bind.h" #include #include +#include +#include -using boost::bind; - -using std::auto_ptr; -using std::endl; -using std::equal_to; -using std::find; -using std::find_if; -using std::for_each; -using std::string; -using std::vector; -using std::back_inserter; -using std::transform; - +using namespace std; +using namespace lyx::support; namespace lyx { -using support::addName; -using support::bformat; -using support::FileName; -using support::makeDisplayPath; -using support::onlyFilename; -using support::removeAutosaveFile; -using support::package; -using support::prefixIs; - namespace Alert = lyx::frontend::Alert; @@ -65,6 +51,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(); @@ -95,86 +90,14 @@ BufferList::const_iterator BufferList::end() const } -bool BufferList::quitWriteBuffer(Buffer * buf) -{ - BOOST_ASSERT(buf); - - docstring file; - - // FIXME: Unicode? - if (buf->isUnnamed()) - file = from_utf8(buf->fileName().onlyFileName()); - else - file = buf->fileName().displayName(30); - - docstring const text = - bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document or discard the changes?"), - file); - int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); - - if (ret == 0) { - // FIXME: WriteAs can be asynch ! - // but not right now...maybe we should remove that - - bool succeeded; - - if (buf->isUnnamed()) - succeeded = buf->writeAs(); - else - succeeded = buf->menuWrite(); - - if (!succeeded) - return false; - } else if (ret == 1) { - // if we crash after this we could - // have no autosave file but I guess - // this is really inprobable (Jug) - if (buf->isUnnamed()) - removeAutosaveFile(buf->absFileName()); - - } else { - return false; - } - - return true; -} - - -bool BufferList::quitWriteAll() -{ - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) { - if ((*it)->isClean()) - continue; - - if (!quitWriteBuffer(*it)) - return false; - } - // now, all buffers have been written sucessfully - // save file names to .lyx/session - it = bstore.begin(); - for (; it != end; ++it) { - // if master/slave are both open, do not save slave since it - // will be automatically loaded when the master is loaded - if ((*it)->masterBuffer() == (*it)) - LyX::ref().session().lastOpened().add(FileName((*it)->absFileName())); - } - - return true; -} - - void BufferList::release(Buffer * buf) { - BOOST_ASSERT(buf); + LASSERT(buf, /**/); BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { Buffer * tmp = (*it); - BOOST_ASSERT(tmp); + LASSERT(tmp, /**/); bstore.erase(it); delete tmp; } @@ -183,67 +106,46 @@ void BufferList::release(Buffer * buf) Buffer * BufferList::newBuffer(string const & s, bool const ronly) { - auto_ptr tmpbuf(new Buffer(s, ronly)); + auto_ptr tmpbuf; + try { + tmpbuf.reset(new Buffer(s, ronly)); + } catch (ExceptionMessage const & message) { + if (message.type_ == ErrorException) { + Alert::error(message.title_, message.details_); + exit(1); + } else if (message.type_ == WarningException) { + Alert::warning(message.title_, message.details_); + return 0; + } + } tmpbuf->params().useClassDefaults(); - LYXERR(Debug::INFO) << "Assigning to buffer " - << bstore.size() << endl; - bstore.push_back(tmpbuf.get()); + 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(); } void BufferList::closeAll() { - while (!bstore.empty()) { - close(bstore.front(), false); - } + while (!bstore.empty()) + release(bstore.front()); } -bool BufferList::close(Buffer * buf, bool const ask) +FileNameList const & BufferList::fileNames() const { - BOOST_ASSERT(buf); - - if (!ask || buf->isClean() || buf->paragraphs().empty()) { - release(buf); - return true; + static FileNameList nvec; + nvec.clear(); + BufferStorage::const_iterator it = bstore.begin(); + BufferStorage::const_iterator end = bstore.end(); + for (; it != end; ++it) { + Buffer * buf = *it; + nvec.push_back(buf->fileName()); } - - docstring fname; - if (buf->isUnnamed()) - fname = from_utf8(onlyFilename(buf->absFileName())); - else - fname = makeDisplayPath(buf->absFileName(), 30); - - docstring const text = - bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document or discard the changes?"), - fname); - int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); - - if (ret == 0) { - if (buf->isUnnamed()) { - if (!buf->writeAs()) - return false; - } else if (!buf->menuWrite()) - return false; - } else if (ret == 2) - return false; - - removeAutosaveFile(buf->absFileName()); - - release(buf); - return true; -} - - -vector const BufferList::getFileNames() const -{ - vector nvec; - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - boost::bind(&Buffer::absFileName, _1)); return nvec; } @@ -274,34 +176,31 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - BOOST_ASSERT(buf); + LASSERT(buf, /**/); if (bstore.empty()) return 0; BufferStorage::const_iterator it = find(bstore.begin(), bstore.end(), buf); - BOOST_ASSERT(it != bstore.end()); + LASSERT(it != bstore.end(), /**/); ++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); + LASSERT(buf, /**/); 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); + LASSERT(it != bstore.end(), /**/); + + Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); + return previousbuf; } @@ -323,99 +222,48 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, void BufferList::emergencyWriteAll() { - for_each(bstore.begin(), bstore.end(), - bind(&BufferList::emergencyWrite, this, _1)); -} - - -void BufferList::emergencyWrite(Buffer * buf) -{ - // 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)->emergencyWrite(); } -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) +namespace { +struct equivalent_to : public binary_function { - BufferStorage::iterator it = - find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::absFileName, _1), - s)); + bool operator()(FileName const & x, FileName const & y) const + { return equivalent(x, y); } +}; +} + +Buffer * BufferList::getBuffer(support::FileName const & fname) const +{ + // 1) cheap test, using string comparison of file names + BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), + lyx::bind(equal_to(), lyx::bind(&Buffer::fileName, _1), fname)); + if (it != bstore.end()) + return *it; + // 2) possibly expensive test, using equivalence test of file names + it = find_if(bstore.begin(), bstore.end(), + lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname)); return it != bstore.end() ? (*it) : 0; } @@ -424,31 +272,85 @@ 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().record(0, Author(name, email)); + (*it)->params().authors().recordCurrentAuthor(author); } -int BufferList::bufferNum(std::string const & name) const +int BufferList::bufferNum(FileName const & fname) const { - vector buffers = getFileNames(); - vector::const_iterator cit = - std::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()); } +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(); + 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