X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=fe6516fa4be836f54552ca53e9110a4d4d340f9b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=7ae6d255d5cdc116bcd1c667664daa21916a2feb;hpb=1684282f8a314dbab4f7fc7b38215a35336bc2d1;p=lyx.git diff --git a/src/bufferlist.C b/src/bufferlist.C index 7ae6d255d5..fe6516fa4b 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -17,33 +17,49 @@ #include "bufferparams.h" #include "debug.h" #include "gettext.h" -#include "lastfiles.h" +#include "session.h" #include "lyx_cb.h" #include "lyx_main.h" +#include "output_latex.h" #include "paragraph.h" +#include "ParagraphList.h" #include "frontends/Alert.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" +#include "support/package.h" #include -using lyx::support::AddName; -using lyx::support::bformat; -using lyx::support::GetEnvPath; -using lyx::support::MakeAbsPath; -using lyx::support::MakeDisplayPath; -using lyx::support::OnlyFilename; -using lyx::support::removeAutosaveFile; -using lyx::support::prefixIs; +#include +#include + +namespace lyx { + +using support::addName; +using support::bformat; +using support::makeAbsPath; +using support::makeDisplayPath; +using support::onlyFilename; +using support::removeAutosaveFile; +using support::package; +using support::prefixIs; + +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; + +namespace Alert = lyx::frontend::Alert; BufferList::BufferList() @@ -58,14 +74,18 @@ bool BufferList::empty() const bool BufferList::quitWriteBuffer(Buffer * buf) { - string file; + BOOST_ASSERT(buf); + + docstring file; if (buf->isUnnamed()) - file = OnlyFilename(buf->fileName()); + file = from_utf8(onlyFilename(buf->fileName())); else - file = MakeDisplayPath(buf->fileName(), 30); + file = makeDisplayPath(buf->fileName(), 30); - string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document or discard the changes?"), file); + 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")); @@ -76,9 +96,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf) bool succeeded; if (buf->isUnnamed()) - succeeded = WriteAs(buf); + succeeded = writeAs(buf); else - succeeded = MenuWrite(buf); + succeeded = menuWrite(buf); if (!succeeded) return false; @@ -108,6 +128,15 @@ bool BufferList::quitWriteAll() 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((*it)->fileName()); + } return true; } @@ -116,23 +145,25 @@ bool BufferList::quitWriteAll() void BufferList::release(Buffer * buf) { BOOST_ASSERT(buf); - BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf); + BufferStorage::iterator const it = + find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { Buffer * tmp = (*it); + BOOST_ASSERT(tmp); bstore.erase(it); delete tmp; } } -Buffer * BufferList::newBuffer(string const & s, bool ronly) +Buffer * BufferList::newBuffer(string const & s, bool const ronly) { - Buffer * tmpbuf = new Buffer(s, ronly); + auto_ptr tmpbuf(new Buffer(s, ronly)); tmpbuf->params().useClassDefaults(); lyxerr[Debug::INFO] << "Assigning to buffer " << bstore.size() << endl; - bstore.push_back(tmpbuf); - return tmpbuf; + bstore.push_back(tmpbuf.get()); + return tmpbuf.release(); } @@ -144,39 +175,38 @@ void BufferList::closeAll() } -bool BufferList::close(Buffer * buf, bool ask) +bool BufferList::close(Buffer * buf, bool const ask) { BOOST_ASSERT(buf); - // FIXME: is the quitting check still necessary ? - if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) { + if (!ask || buf->isClean() || buf->paragraphs().empty()) { release(buf); return true; } - string fname; + docstring fname; if (buf->isUnnamed()) - fname = OnlyFilename(buf->fileName()); + fname = from_utf8(onlyFilename(buf->fileName())); else - fname = MakeDisplayPath(buf->fileName(), 30); + fname = makeDisplayPath(buf->fileName(), 30); - string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document or discard the changes?"), fname); + 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)) + if (!writeAs(buf)) return false; - } else if (buf->save()) { - LyX::ref().lastfiles().newFile(buf->fileName()); - } else { + } else if (!menuWrite(buf)) return false; - } - } else if (ret == 2) { + else + return false; + } else if (ret == 2) return false; - } if (buf->isUnnamed()) { removeAutosaveFile(buf->fileName()); @@ -190,8 +220,9 @@ bool BufferList::close(Buffer * buf, bool ask) vector const BufferList::getFileNames() const { vector nvec; - std::copy(bstore.begin(), bstore.end(), - lyx::back_inserter_fun(nvec, &Buffer::fileName)); + transform(bstore.begin(), bstore.end(), + back_inserter(nvec), + boost::bind(&Buffer::fileName, _1)); return nvec; } @@ -204,7 +235,7 @@ Buffer * BufferList::first() } -Buffer * BufferList::getBuffer(unsigned int choice) +Buffer * BufferList::getBuffer(unsigned int const choice) { if (choice >= bstore.size()) return 0; @@ -212,8 +243,41 @@ Buffer * BufferList::getBuffer(unsigned int choice) } +Buffer * BufferList::next(Buffer const * buf) const +{ + BOOST_ASSERT(buf); + + if (bstore.empty()) + return 0; + BufferStorage::const_iterator it = find(bstore.begin(), + bstore.end(), buf); + BOOST_ASSERT(it != bstore.end()); + ++it; + if (it == bstore.end()) + return bstore.front(); + else + return *it; +} + + +Buffer * BufferList::previous(Buffer const * buf) const +{ + BOOST_ASSERT(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); +} + + void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, - LatexRunParams const & runparams) + OutputParams const & runparams) { BufferStorage::iterator it = bstore.begin(); BufferStorage::iterator end = bstore.end(); @@ -233,25 +297,26 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, void BufferList::emergencyWriteAll() { for_each(bstore.begin(), bstore.end(), - boost::bind(&BufferList::emergencyWrite, this, _1)); + bind(&BufferList::emergencyWrite, this, _1)); } void BufferList::emergencyWrite(Buffer * buf) { - // assert(buf) // this is not good since C assert takes an int - // and a pointer is a long (JMarc) - assert(buf != 0); // use c assert to avoid a loop - + // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert + // compare with 0 to avoid pointer/interger comparison + assert(buf != 0); // No need to save if the buffer has not changed. if (buf->isClean()) return; string const doc = buf->isUnnamed() - ? OnlyFilename(buf->fileName()) : buf->fileName(); + ? onlyFilename(buf->fileName()) : buf->fileName(); - lyxerr << bformat(_("LyX: Attempting to save document %1$s"), doc) << endl; + 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. @@ -261,44 +326,46 @@ void BufferList::emergencyWrite(Buffer * buf) lyxerr << " " << s << endl; if (buf->writeFile(s)) { buf->markClean(); - lyxerr << _(" Save seems successful. Phew.") << endl; + lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; return; } else { - lyxerr << _(" Save failed! Trying...") << endl; + lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; } } // 2) In HOME directory. - string s = AddName(GetEnvPath("HOME"), buf->fileName()); + string s = addName(package().home_dir(), buf->fileName()); s += ".emergency"; lyxerr << ' ' << s << endl; if (buf->writeFile(s)) { buf->markClean(); - lyxerr << _(" Save seems successful. Phew.") << endl; + lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; return; } - lyxerr << _(" Save failed! Trying...") << endl; + lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; // 3) In "/tmp" directory. // MakeAbsPath to prepend the current // drive letter on OS/2 - s = AddName(MakeAbsPath("/tmp/"), buf->fileName()); + s = addName(package().temp_dir(), buf->fileName()); s += ".emergency"; lyxerr << ' ' << s << endl; if (buf->writeFile(s)) { buf->markClean(); - lyxerr << _(" Save seems successful. Phew.") << endl; + lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; return; } - lyxerr << _(" Save failed! Bummer. Document is lost.") << endl; + lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl; } bool BufferList::exists(string const & s) const { return find_if(bstore.begin(), bstore.end(), - lyx::compare_memfun(&Buffer::fileName, s)) + bind(equal_to(), + bind(&Buffer::fileName, _1), + s)) != bstore.end(); } @@ -316,7 +383,10 @@ Buffer * BufferList::getBuffer(string const & s) { BufferStorage::iterator it = find_if(bstore.begin(), bstore.end(), - lyx::compare_memfun(&Buffer::fileName, s)); + bind(equal_to(), + bind(&Buffer::fileName, _1), + s)); + return it != bstore.end() ? (*it) : 0; } @@ -340,3 +410,6 @@ void BufferList::setCurrentAuthor(string const & name, string const & email) (*it)->params().authors().record(0, Author(name, email)); } } + + +} // namespace lyx