X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=e46d1015868eed6e625b9ed741aebf0ae0dbac63;hb=e4c9689906e05c94116feea53ff29ad00a0e5a0b;hp=ea174c05d3d34fa73c4fa36899cde9ebf89842e7;hpb=ada0bd00f07c85235c6653a0f7ecb04a8c28b54d;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index ea174c05d3..e46d101586 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,19 +15,23 @@ #include "Author.h" #include "Buffer.h" #include "BufferParams.h" -#include "debug.h" -#include "gettext.h" #include "Session.h" -#include "callback.h" #include "LyX.h" #include "output_latex.h" #include "ParagraphList.h" #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 "support/lassert.h" #include #include @@ -35,29 +39,11 @@ 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,84 +90,14 @@ BufferList::const_iterator BufferList::end() const } -bool BufferList::quitWriteBuffer(Buffer * buf) -{ - BOOST_ASSERT(buf); - - docstring file; - if (buf->isUnnamed()) - file = from_utf8(onlyFilename(buf->fileName())); - else - file = makeDisplayPath(buf->fileName(), 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 = writeAs(buf); - else - succeeded = menuWrite(buf); - - 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->fileName()); - - } 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)->getMasterBuffer() == (*it)) - LyX::ref().session().lastOpened().add(FileName((*it)->fileName())); - } - - 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; } @@ -181,68 +106,40 @@ 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->fileName().extension() == "internal") { + 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); - } -} - - -bool BufferList::close(Buffer * buf, bool const ask) -{ - BOOST_ASSERT(buf); - - if (!ask || buf->isClean() || buf->paragraphs().empty()) { - release(buf); - return true; - } - - docstring fname; - if (buf->isUnnamed()) - fname = from_utf8(onlyFilename(buf->fileName())); - else - fname = makeDisplayPath(buf->fileName(), 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 (!writeAs(buf)) - return false; - } else if (!menuWrite(buf)) - return false; - else - return false; - } else if (ret == 2) - return false; - - if (buf->isUnnamed()) { - removeAutosaveFile(buf->fileName()); - } - - release(buf); - return true; + while (!bstore.empty()) + release(bstore.front()); } -vector const BufferList::getFileNames() const +FileNameList const & BufferList::fileNames() const { - vector nvec; + static FileNameList nvec; + nvec.clear(); transform(bstore.begin(), bstore.end(), back_inserter(nvec), boost::bind(&Buffer::fileName, _1)); @@ -266,7 +163,7 @@ Buffer * BufferList::last() } -Buffer * BufferList::getBuffer(unsigned int const choice) +Buffer * BufferList::getBuffer(unsigned int choice) { if (choice >= bstore.size()) return 0; @@ -276,48 +173,45 @@ Buffer * BufferList::getBuffer(unsigned int const 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; } -void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, +void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, OutputParams const & runparams) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); for (; it != end; ++it) { - if (!(*it)->isDepClean(mastertmpdir)) { - string writefile = addName(mastertmpdir, (*it)->getLatexName()); - (*it)->makeLaTeXFile(FileName(writefile), mastertmpdir, + if (!(*it)->isDepClean(masterTmpDir)) { + string writefile = addName(masterTmpDir, (*it)->latexName()); + (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir, runparams, false); - (*it)->markDepClean(mastertmpdir); + (*it)->markDepClean(masterTmpDir); } } } @@ -330,92 +224,86 @@ void BufferList::emergencyWriteAll() } -void BufferList::emergencyWrite(Buffer * buf) +docstring 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); + // ::assert(buf != 0); + if (!buf) + return _("No file open!"); // No need to save if the buffer has not changed. if (buf->isClean()) - return; + return docstring(); string const doc = buf->isUnnamed() - ? onlyFilename(buf->fileName()) : buf->fileName(); + ? onlyFilename(buf->absFileName()) : buf->absFileName(); - lyxerr << to_utf8( - bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc))) - << endl; + docstring user_message = bformat( + _("LyX: Attempting to save document %1$s\n"), from_utf8(doc)); // We try to save three places: // 1) Same place as document. Unless it is an unnamed doc. if (!buf->isUnnamed()) { - string s = buf->fileName(); + 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; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } else { - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; + user_message += _(" Save failed! Trying...\n"); } } // 2) In HOME directory. - string s = addName(package().home_dir().absFilename(), buf->fileName()); + 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; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; + user_message += _(" Save failed! Trying...\n"); // 3) In "/tmp" directory. // MakeAbsPath to prepend the current // drive letter on OS/2 - s = addName(package().temp_dir().absFilename(), buf->fileName()); + 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; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } - lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl; + + user_message += _(" Save failed! Bummer. Document is lost."); + return user_message; } -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::fileName, _1), - s)) - != bstore.end(); + return getBuffer(fname) != 0; } bool BufferList::isLoaded(Buffer const * b) const { - BOOST_ASSERT(b); BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); } -Buffer * BufferList::getBuffer(string const & s) +Buffer * BufferList::getBuffer(support::FileName const & fname) const { - BufferStorage::iterator it = - find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::fileName, _1), - s)); - + BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), + bind(equal_to(), bind(&Buffer::fileName, _1), fname)); return it != bstore.end() ? (*it) : 0; } @@ -435,9 +323,43 @@ void BufferList::setCurrentAuthor(docstring const & name, docstring const & emai { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) { + for (; it != end; ++it) (*it)->params().authors().record(0, Author(name, email)); +} + + +int BufferList::bufferNum(FileName const & fname) const +{ + 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. + if (child->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; }