X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=e4497ba2343298619a505eef8b2dd88d9a08af2f;hb=e059c633b01937f450ff9fa873cfc6b773aa74cc;hp=5373667768a23f928b734564b34e443000fe3e73;hpb=e8022b10a11e41d56897e3b066aa5180025165cc;p=lyx.git diff --git a/src/bufferlist.C b/src/bufferlist.C index 5373667768..e4497ba234 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -3,10 +3,10 @@ * * LyX, The Document Word Processor * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995 Matthias Ettrich + * Copyright 1995-2000 The LyX Team. * - * This file is Copyright 1996-1999 + * This file is Copyright 1996-2000 * Lars Gullik Bjønnes * * ====================================================== @@ -17,8 +17,9 @@ #endif #include -#include -#include + +#include + #include "bufferlist.h" #include "lyx_main.h" #include "minibuffer.h" @@ -28,16 +29,19 @@ #include "lastfiles.h" #include "debug.h" #include "lyxrc.h" -#include "lyxscreen.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 BufferView * current_view; -extern MiniBuffer * minibuffer; -extern void SmallUpdate(signed char); -extern void BeforeChange(); -extern int RunLinuxDoc(int, string const &); +extern BufferView * current_view; // called too many times in this file... + +using std::vector; +using std::find; +using std::endl; // // Class BufferStorage @@ -45,26 +49,25 @@ extern int RunLinuxDoc(int, string const &); void BufferStorage::release(Buffer * buf) { - for(Container::iterator it = container.begin(); - it != container.end(); ++it) { - if ((*it) == buf) { - Buffer * tmpbuf = (*it); - container.erase(it); - delete tmpbuf; - break; - } + Container::iterator it = find(container.begin(), container.end(), buf); + if (it != container.end()) { + // Make sure that we don't store a LyXText in + // the textcache that points to the buffer + // we just deleted. + Buffer * tmp = (*it); + container.erase(it); + textcache.removeAllWithBuffer(tmp); + delete tmp; } } -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() + 1 << endl; + << container.size() << endl; container.push_back(tmpbuf); return tmpbuf; } @@ -75,12 +78,11 @@ Buffer * BufferStorage::newBuffer(string const & s, // BufferList::BufferList() -{ - _state = BufferList::OK; -} + : state_(BufferList::OK) +{} -bool BufferList::empty() +bool BufferList::empty() const { return bstore.empty(); } @@ -96,7 +98,7 @@ bool BufferList::QwriteAll() it != bstore.end(); ++it) { if (!(*it)->isLyxClean()) { switch(AskConfirmation(_("Changes in document:"), - MakeDisplayPath((*it)->filename, + MakeDisplayPath((*it)->fileName(), 50), _("Save document?"))) { case 1: // Yes @@ -104,7 +106,8 @@ bool BufferList::QwriteAll() break; case 2: // No askMoreConfirmation = true; - unsaved += MakeDisplayPath((*it)->filename, 50); + unsaved += MakeDisplayPath((*it)->fileName(), + 50); unsaved += "\n"; break; case 3: // Cancel @@ -113,7 +116,7 @@ bool BufferList::QwriteAll() } } if (askMoreConfirmation && - lyxrc->exit_confirmation && + lyxrc.exit_confirmation && !AskQuestion(_("Some documents were not saved:"), unsaved, _("Exit anyway?"))) { return false; @@ -123,118 +126,17 @@ bool BufferList::QwriteAll() } -// Should probably be moved to somewhere else: BufferView? LyXView? -bool BufferList::write(Buffer * buf, bool makeBackup) -{ - minibuffer->Set(_("Saving document"), - MakeDisplayPath(buf->filename), "..."); - - // We don't need autosaves in the immediate future. (Asger) - buf->resetAutosaveTimers(); - - // make a backup - if (makeBackup) { - string s = buf->filename + '~'; - // Rename is the wrong way of making a backup, - // this is the correct way. - /* truss cp fil fil2: - lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT - stat("LyXVC.lyx", 0xEFFFF688) = 0 - open("LyXVC.lyx", O_RDONLY) = 3 - open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4 - fstat(4, 0xEFFFF508) = 0 - fstat(3, 0xEFFFF508) = 0 - read(3, " # T h i s f i l e w".., 8192) = 5579 - write(4, " # T h i s f i l e w".., 5579) = 5579 - read(3, 0xEFFFD4A0, 8192) = 0 - close(4) = 0 - close(3) = 0 - chmod("LyXVC3.lyx", 0100644) = 0 - lseek(0, 0, SEEK_CUR) = 46440 - _exit(0) - */ - - // Should proabaly have some more error checking here. - // Should be cleaned up in 0.13, at least a bit. - // Doing it this way, also makes the inodes stay the same. - // This is still not a very good solution, in particular we - // might loose the owner of the backup. - FileInfo finfo(buf->filename); - if (finfo.exist()) { - mode_t fmode = finfo.getMode(); - - struct utimbuf *times = - (struct utimbuf*)new char[sizeof(struct utimbuf)]; - times->actime = finfo.getAccessTime(); - times->modtime = finfo.getModificationTime(); - long blksize = finfo.getBlockSize(); - lyxerr.debug() << "BlockSize: " << blksize << endl; - FilePtr fin(buf->filename, FilePtr::read); - FilePtr fout(s, FilePtr::truncate); - if (fin() && fout()) { - char * cbuf = new char[blksize+1]; - size_t c_read = 0; - size_t c_write = 0; - do { - c_read = fread(cbuf, 1, blksize, fin); - if (c_read != 0) - c_write = - fwrite(cbuf, 1, c_read, fout); - } while (c_read); - fin.close(); - fout.close(); - chmod(s.c_str(), fmode); - - if (utime(s.c_str(), times)) { - lyxerr << "utime error." << endl; - } - delete [] cbuf; - } else { - lyxerr << "LyX was not able to make backupcopy. Beware." << endl; - } - delete[] times; - } - } - - if (buf->writeFile(buf->filename, false)) { - buf->markLyxClean(); - - minibuffer->Set(_("Document saved as"), - MakeDisplayPath(buf->filename)); - - // now delete the autosavefile - string a = OnlyPath(buf->filename); - a += '#'; - a += OnlyFilename(buf->filename); - a += '#'; - FileInfo fileinfo(a); - if (fileinfo.exist()) { - if (remove(a.c_str()) != 0) { - WriteFSAlert(_("Could not delete " - "auto-save file!"), a); - } - } - } else { - // Saving failed, so backup is not backup - if (makeBackup) { - string s = buf->filename + '~'; - rename(s.c_str(), buf->filename.c_str()); - } - minibuffer->Set(_("Save failed!")); - return false; - } - - return true; -} - - void BufferList::closeAll() { - _state = BufferList::CLOSING; + state_ = BufferList::CLOSING; + // Since we are closing we can just as well delete all + // in the textcache this will also speed the closing/quiting up a bit. + textcache.clear(); + while (!bstore.empty()) { close(bstore.front()); } - _state = BufferList::OK; + state_ = BufferList::OK; } @@ -249,26 +151,26 @@ void BufferList::resize() bool BufferList::close(Buffer * buf) { - buf->InsetUnlock(); + if (buf->getUser()) buf->getUser()->insetUnlock(); if (buf->paragraph && !buf->isLyxClean() && !quitting) { - ProhibitInput(); + ProhibitInput(buf->getUser()); switch(AskConfirmation(_("Changes in document:"), - MakeDisplayPath(buf->filename, 50), - _("Save document?"))){ + MakeDisplayPath(buf->fileName(), 50), + _("Save document?"))){ case 1: // Yes - if (write(buf)) { - lastfiles->newFile(buf->filename); + if (buf->save()) { + lastfiles->newFile(buf->fileName()); } else { - AllowInput(); + AllowInput(buf->getUser()); return false; } break; case 3: // Cancel - AllowInput(); + AllowInput(buf->getUser()); return false; } - AllowInput(); + AllowInput(buf->getUser()); } bstore.release(buf); @@ -276,19 +178,14 @@ bool BufferList::close(Buffer * buf) } -void BufferList::makePup(int pup) - /* This should be changed to return a char const *const - in the same way as for lastfiles.[hC] - */ +vector BufferList::getFileNames() const { - int ant = 0; - for(BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - string relbuf = MakeDisplayPath((*it)->filename, 30); - fl_addtopup(pup, relbuf.c_str()); - ++ant; + vector nvec; + for(BufferStorage::const_iterator cit = bstore.begin(); + cit != bstore.end(); ++cit) { + nvec.push_back((*cit)->fileName()); } - if (ant == 0) fl_addtopup(pup, _("No Documents Open!%t")); + return nvec; } @@ -306,26 +203,14 @@ Buffer * BufferList::getBuffer(int choice) } -void BufferList::updateInset(Inset * inset, bool mark_dirty) -{ - for (BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - if ((*it)->text && (*it)->text->UpdateInset(inset)) { - if (mark_dirty) - (*it)->markDirty(); - break; - } - } -} - - int BufferList::unlockInset(UpdatableInset * inset) { if (!inset) return 1; for(BufferStorage::iterator it = bstore.begin(); it != bstore.end(); ++it) { - if ((*it)->the_locking_inset == inset) { - (*it)->InsetUnlock(); + if ((*it)->getUser() + && (*it)->getUser()->the_locking_inset == inset) { + (*it)->getUser()->insetUnlock(); return 0; } } @@ -340,12 +225,11 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir) if (!(*it)->isDepClean(mastertmpdir)) { string writefile = mastertmpdir; writefile += '/'; - writefile += ChangeExtension((*it)->getFileName(), + writefile += ChangeExtension((*it)->fileName(), ".tex", true); (*it)->makeLaTeXFile(writefile, mastertmpdir, false, true); (*it)->markDepClean(mastertmpdir); - } } } @@ -359,8 +243,8 @@ void BufferList::emergencyWriteAll() bool madeit = false; lyxerr <<_("lyx: Attempting to save" - " document ") - << (*it)->filename + " document ") + << (*it)->fileName() << _(" as...") << endl; for (int i = 0; i < 3 && !madeit; ++i) { @@ -371,13 +255,15 @@ void BufferList::emergencyWriteAll() // 2) In HOME directory. // 3) In "/tmp" directory. if (i == 0) { - s = (*it)->filename; + s = (*it)->fileName(); } else if (i == 1) { s = AddName(GetEnvPath("HOME"), - (*it)->filename); - } else { // MakeAbsPath to prepend the current drive letter on OS/2 + (*it)->fileName()); + } else { + // MakeAbsPath to prepend the current + // drive letter on OS/2 s = AddName(MakeAbsPath("/tmp/"), - (*it)->filename); + (*it)->fileName()); } s += ".emergency"; @@ -392,7 +278,9 @@ void BufferList::emergencyWriteAll() lyxerr << _(" Save failed! Trying...") << endl; } else { - lyxerr << _(" Save failed! Bummer. Document is lost.") << endl; + lyxerr << _(" Save failed! Bummer. " + "Document is lost.") + << endl; } } } @@ -402,7 +290,7 @@ void BufferList::emergencyWriteAll() 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); @@ -429,7 +317,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly) use_emergency = true; } else { // Here, we should delete the emergency save - unlink(e.c_str()); + ::unlink(e.c_str()); } } } @@ -452,7 +340,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly) b->markDirty(); } else { // Here, we should delete the autosave - unlink(a.c_str()); + ::unlink(a.c_str()); } } } @@ -469,22 +357,30 @@ Buffer * BufferList::readFile(string const & s, bool ronly) } -bool BufferList::exists(string const & s) +bool BufferList::exists(string const & s) const { - for (BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { - if ((*it)->filename == s) + for (BufferStorage::const_iterator cit = bstore.begin(); + cit != bstore.end(); ++cit) { + if ((*cit)->fileName() == s) return true; } return false; } +bool BufferList::isLoaded(Buffer const * b) const +{ + BufferStorage::const_iterator cit = + find(bstore.begin(), bstore.end(), b); + return cit != bstore.end(); +} + + Buffer * BufferList::getBuffer(string const & s) { for(BufferStorage::iterator it = bstore.begin(); it != bstore.end(); ++it) { - if ((*it)->filename == s) + if ((*it)->fileName() == s) return (*it); } return 0; @@ -493,14 +389,14 @@ Buffer * BufferList::getBuffer(string const & s) Buffer * BufferList::newFile(string const & name, string tname) { - /* get a free buffer */ - Buffer * b = bstore.newBuffer(name, lyxrc); + // get a free buffer + Buffer * b = bstore.newBuffer(name); // use defaults.lyx as a default template if it exists. if (tname.empty()) { tname = LibFileSearch("templates", "defaults.lyx"); } - if (!tname.empty() && IsLyXFilename(tname)){ + if (!tname.empty() && IsLyXFilename(tname)) { bool templateok = false; LyXLex lex(0, 0); lex.setFile(tname); @@ -532,26 +428,6 @@ 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); - } - } - // file already open? if (exists(s)) { if (AskQuestion(_("Document is already open:"), @@ -572,8 +448,11 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles) bool ro = false; switch (IsFileWriteable(s)) { case 0: - minibuffer->Set(_("File `")+MakeDisplayPath(s, 50)+ - _("' is read-only.")); +#if 0 + current_view->owner()->getMiniBuffer()-> + Set(_("File `") + MakeDisplayPath(s, 50) + + _("' is read-only.")); +#endif ro = true; // Fall through case 1: @@ -587,20 +466,26 @@ 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. - lyxerr << "Do you want to checkout?" << endl; + 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. + RCS::retrive(s); + return loadLyXFile(filename, tolastfiles); + } } if (AskQuestion(_("Cannot open specified file:"), MakeDisplayPath(s, 50), _("Create new document with this name?"))) - { - // Find a free buffer - b = newFile(s, string()); - } + { + // Find a free buffer + b = newFile(s, string()); + } break; } if (b && tolastfiles) - lastfiles->newFile(b->getFileName()); + lastfiles->newFile(b->fileName()); return b; }