X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=3f4477636478f3fe8f20590692be00d5112c1ee7;hb=e72ef278b8c4b4bc1b0009cb00a1a56c7b02d2e8;hp=d1172be6080bbce07bd7a9a6f62ce9189c537d2a;hpb=b92c96554385bcbc91262cd9a83766f422552564;p=lyx.git diff --git a/src/bufferlist.C b/src/bufferlist.C index d1172be608..3f44776364 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -19,26 +19,35 @@ #include #include +#include #include "bufferlist.h" #include "lyx_main.h" #include "minibuffer.h" #include "support/FileInfo.h" #include "support/filetools.h" +#include "support/lyxmanip.h" +#include "support/lyxfunctional.h" #include "lyx_gui_misc.h" #include "lastfiles.h" #include "debug.h" #include "lyxrc.h" #include "lyxtext.h" #include "lyx_cb.h" +#include "bufferview_funcs.h" #include "gettext.h" #include "LyXView.h" #include "vc-backend.h" #include "TextCache.h" -extern int RunLinuxDoc(int, string const &); - +using std::vector; using std::find; +using std::endl; +using std::find_if; +using std::for_each; +using std::mem_fun; + +extern BufferView * current_view; // // Class BufferStorage @@ -59,14 +68,12 @@ void BufferStorage::release(Buffer * buf) } -Buffer * BufferStorage::newBuffer(string const & s, - LyXRC * lyxrc, - bool ronly) +Buffer * BufferStorage::newBuffer(string const & s, bool ronly) { - Buffer * tmpbuf = new Buffer(s, lyxrc, ronly); + Buffer * tmpbuf = new Buffer(s, ronly); tmpbuf->params.useClassDefaults(); - lyxerr.debug() << "Assigning to buffer " - << container.size() << endl; + lyxerr[Debug::INFO] << "Assigning to buffer " + << container.size() << endl; container.push_back(tmpbuf); return tmpbuf; } @@ -87,35 +94,50 @@ bool BufferList::empty() const } -extern void MenuWrite(Buffer *); - bool BufferList::QwriteAll() { bool askMoreConfirmation = false; string unsaved; - for(BufferStorage::iterator it = bstore.begin(); + for (BufferStorage::iterator it = bstore.begin(); it != bstore.end(); ++it) { if (!(*it)->isLyxClean()) { - switch(AskConfirmation(_("Changes in document:"), - MakeDisplayPath((*it)->fileName(), - 50), - _("Save document?"))) { - case 1: // Yes - MenuWrite((*it)); - break; - case 2: // No - askMoreConfirmation = true; - unsaved += MakeDisplayPath((*it)->fileName(), - 50); - unsaved += "\n"; - break; - case 3: // Cancel - return false; + string fname; + if ((*it)->isUnnamed()) + fname = OnlyFilename((*it)->fileName()); + else + fname = MakeDisplayPath((*it)->fileName(), 50); + bool reask = true; + while (reask) { + switch (AskConfirmation(_("Changes in document:"), + fname, + _("Save document?"))) { + case 1: // Yes + if ((*it)->isUnnamed()) + reask = !MenuWriteAs(current_view, (*it)); + else { + reask = !MenuWrite(current_view, (*it)); + } + break; + case 2: // No + // if we crash after this we could + // have no autosave file but I guess + // this is really inprobable (Jug) + if ((*it)->isUnnamed()) { + removeAutosaveFile((*it)->fileName()); + } + askMoreConfirmation = true; + unsaved += MakeDisplayPath(fname, 50); + unsaved += "\n"; + reask = false; + break; + case 3: // Cancel + return false; + } } } } if (askMoreConfirmation && - lyxrc->exit_confirmation && + lyxrc.exit_confirmation && !AskQuestion(_("Some documents were not saved:"), unsaved, _("Exit anyway?"))) { return false; @@ -141,35 +163,56 @@ void BufferList::closeAll() void BufferList::resize() { - for(BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - (*it)->resize(); - } + for_each(bstore.begin(), bstore.end(), mem_fun(&Buffer::resize)); } bool BufferList::close(Buffer * buf) { - if (buf->getUser()) buf->getUser()->insetUnlock(); + // CHECK + // Trace back why we need to use buf->getUser here. + // Perhaps slight rewrite is in order? (Lgb) + if (buf->getUser()) buf->getUser()->insetUnlock(); if (buf->paragraph && !buf->isLyxClean() && !quitting) { - ProhibitInput(); - switch(AskConfirmation(_("Changes in document:"), - MakeDisplayPath(buf->fileName(), 50), - _("Save document?"))){ - case 1: // Yes - if (buf->save(lyxrc->make_backup)) { - lastfiles->newFile(buf->fileName()); - } else { - AllowInput(); + if (buf->getUser()) + ProhibitInput(buf->getUser()); + string fname; + if (buf->isUnnamed()) + fname = OnlyFilename(buf->fileName()); + else + fname = MakeDisplayPath(buf->fileName(), 50); + bool reask = true; + while (reask) { + switch (AskConfirmation(_("Changes in document:"), + fname, + _("Save document?"))){ + case 1: // Yes + if (buf->isUnnamed()) + reask = !MenuWriteAs(current_view, buf); + else if (buf->save()) { + lastfiles->newFile(buf->fileName()); + reask = false; + } else { + if (buf->getUser()) + AllowInput(buf->getUser()); + return false; + } + break; + case 2: + if (buf->isUnnamed()) { + removeAutosaveFile(buf->fileName()); + } + reask = false; + break; + case 3: // Cancel + if (buf->getUser()) + AllowInput(buf->getUser()); return false; } - break; - case 3: // Cancel - AllowInput(); - return false; - } - AllowInput(); + } + if (buf->getUser()) + AllowInput(buf->getUser()); } bstore.release(buf); @@ -177,13 +220,11 @@ bool BufferList::close(Buffer * buf) } -vector BufferList::getFileNames() const +vector const BufferList::getFileNames() const { vector nvec; - for(BufferStorage::const_iterator cit = bstore.begin(); - cit != bstore.end(); ++cit) { - nvec.push_back((*cit)->fileName()); - } + std::copy(bstore.begin(), bstore.end(), + back_inserter_fun(nvec, &Buffer::fileName)); return nvec; } @@ -195,7 +236,7 @@ Buffer * BufferList::first() } -Buffer * BufferList::getBuffer(int choice) +Buffer * BufferList::getBuffer(unsigned int choice) { if (choice >= bstore.size()) return 0; return bstore[choice]; @@ -205,10 +246,10 @@ Buffer * BufferList::getBuffer(int choice) int BufferList::unlockInset(UpdatableInset * inset) { if (!inset) return 1; - for(BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { + for (BufferStorage::iterator it = bstore.begin(); + it != bstore.end(); ++it) { if ((*it)->getUser() - && (*it)->getUser()->the_locking_inset == inset) { + && (*it)->getUser()->theLockingInset() == inset) { (*it)->getUser()->insetUnlock(); return 0; } @@ -219,13 +260,12 @@ int BufferList::unlockInset(UpdatableInset * inset) void BufferList::updateIncludedTeXfiles(string const & mastertmpdir) { - for(BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { + for (BufferStorage::iterator it = bstore.begin(); + it != bstore.end(); ++it) { if (!(*it)->isDepClean(mastertmpdir)) { string writefile = mastertmpdir; writefile += '/'; - writefile += ChangeExtension((*it)->fileName(), - ".tex", true); + writefile += (*it)->getLatexName(); (*it)->makeLaTeXFile(writefile, mastertmpdir, false, true); (*it)->markDepClean(mastertmpdir); @@ -236,60 +276,67 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir) void BufferList::emergencyWriteAll() { - for (BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - if (!(*it)->isLyxClean()) { - bool madeit = false; - - lyxerr <<_("lyx: Attempting to save" - " document ") - << (*it)->fileName() - << _(" as...") << endl; - - for (int i = 0; i < 3 && !madeit; ++i) { - string s; - - // We try to save three places: - // 1) Same place as document. - // 2) In HOME directory. - // 3) In "/tmp" directory. - if (i == 0) { - s = (*it)->fileName(); - } else if (i == 1) { - s = AddName(GetEnvPath("HOME"), - (*it)->fileName()); - } else { - // MakeAbsPath to prepend the current - // drive letter on OS/2 - s = AddName(MakeAbsPath("/tmp/"), - (*it)->fileName()); - } - s += ".emergency"; - - lyxerr << " " << i + 1 << ") " << s << endl; - - if ((*it)->writeFile(s, true)) { - (*it)->markLyxClean(); - lyxerr << _(" Save seems successful. " - "Phew.") << endl; - madeit = true; - } else if (i != 2) { - lyxerr << _(" Save failed! Trying...") - << endl; - } else { - lyxerr << _(" Save failed! Bummer. " - "Document is lost.") - << endl; - } - } + for_each(bstore.begin(), bstore.end(), + class_fun(*this, &BufferList::emergencyWrite)); +} + + +void BufferList::emergencyWrite(Buffer * buf) +{ + // No need to save if the buffer has not changed. + if (buf->isLyxClean()) return; + + lyxerr << fmt(_("lyx: Attempting to save document %s as..."), + buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str() + : buf->fileName().c_str()) << endl; + + // We try to save three places: + + // 1) Same place as document. Unless it is an unnamed doc. + if (!buf->isUnnamed()) { + string s = buf->fileName(); + s += ".emergency"; + lyxerr << " " << s << endl; + if (buf->writeFile(s, true)) { + buf->markLyxClean(); + lyxerr << _(" Save seems successful. Phew.") << endl; + return; + } else { + lyxerr << _(" Save failed! Trying...") << endl; } } + + // 2) In HOME directory. + string s = AddName(GetEnvPath("HOME"), buf->fileName()); + s += ".emergency"; + lyxerr << " " << s << endl; + if (buf->writeFile(s, true)) { + buf->markLyxClean(); + lyxerr << _(" Save seems successful. Phew.") << endl; + return; + } + + lyxerr << _(" 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 += ".emergency"; + lyxerr << " " << s << endl; + if (buf->writeFile(s, true)) { + buf->markLyxClean(); + lyxerr << _(" Save seems successful. Phew.") << endl; + return; + } + lyxerr << _(" Save failed! Bummer. Document is lost.") << endl; } + Buffer * BufferList::readFile(string const & s, bool ronly) { - Buffer * b = bstore.newBuffer(s, lyxrc, ronly); + Buffer * b = bstore.newBuffer(s, ronly); string ts = s; string e = OnlyPath(s); @@ -316,7 +363,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly) use_emergency = true; } else { // Here, we should delete the emergency save - ::unlink(e.c_str()); + lyx::unlink(e); } } } @@ -339,7 +386,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly) b->markDirty(); } else { // Here, we should delete the autosave - ::unlink(a.c_str()); + lyx::unlink(a); } } } @@ -358,12 +405,8 @@ Buffer * BufferList::readFile(string const & s, bool ronly) bool BufferList::exists(string const & s) const { - for (BufferStorage::const_iterator cit = bstore.begin(); - cit != bstore.end(); ++cit) { - if ((*cit)->fileName() == s) - return true; - } - return false; + return find_if(bstore.begin(), bstore.end(), + compare_memfun(&Buffer::fileName, s)) != bstore.end(); } @@ -377,19 +420,17 @@ bool BufferList::isLoaded(Buffer const * b) const Buffer * BufferList::getBuffer(string const & s) { - for(BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - if ((*it)->fileName() == s) - return (*it); - } - return 0; + BufferStorage::iterator it = + find_if(bstore.begin(), bstore.end(), + compare_memfun(&Buffer::fileName, s)); + return it != bstore.end() ? (*it) : 0; } -Buffer * BufferList::newFile(string const & name, string tname) +Buffer * BufferList::newFile(string const & name, string tname, bool isNamed) { // get a free buffer - Buffer * b = bstore.newBuffer(name, lyxrc); + Buffer * b = bstore.newBuffer(name); // use defaults.lyx as a default template if it exists. if (tname.empty()) { @@ -410,12 +451,15 @@ Buffer * BufferList::newFile(string const & name, string tname) // no template, start with empty buffer b->paragraph = new LyXParagraph; } - } - else { // start with empty buffer + } else { // start with empty buffer b->paragraph = new LyXParagraph; } - b->markDirty(); + if (!lyxrc.new_ask_filename && !isNamed) { + b->setUnnamed(); + b->setFileName(name); + } + b->setReadonly(false); return b; @@ -425,28 +469,8 @@ Buffer * BufferList::newFile(string const & name, string tname) Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles) { // make sure our path is absolute - string s = MakeAbsPath(filename); - - // Is this done too early? - // Is it LinuxDoc? - if (IsSGMLFilename(s)) { - FileInfo fi(s); - if (fi.exist() && fi.readable()) { - if (!RunLinuxDoc(-1, s)) { - s = ChangeExtension (s, ".lyx", false); - } else { // sgml2lyx failed - WriteAlert(_("Error!"), - _("Could not convert file"), s); - return 0; - } - } else { - // just change the extension and it will be - // handled like a regular lyx file that does - // not exist. - s = ChangeExtension(s, ".lyx", false); - } - } - + string const s = MakeAbsPath(filename); + // file already open? if (exists(s)) { if (AskQuestion(_("Document is already open:"), @@ -485,7 +509,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles) if (LyXVC::file_not_found_hook(s)) { // Ask if the file should be checked out for // viewing/editing, if so: load it. - if (AskQuestion(_("Do you want to retrive file under version control?"))) { + if (AskQuestion(_("Do you want to retrieve file under version control?"))) { // How can we know _how_ to do the checkout? // With the current VC support it has to be, // a RCS file since CVS do not have special ,v files. @@ -498,7 +522,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles) _("Create new document with this name?"))) { // Find a free buffer - b = newFile(s, string()); + b = newFile(s, string(), true); } break; }