]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
paragraph-spacing, redoparagraph in deleteemptyparagraphmechanism, got rid of some...
[lyx.git] / src / bufferlist.C
index 5fdc5cd158cf7b41c0481f1c322b073602bedb79..c812f584e889614f96da6fac0dca674b03c91301 100644 (file)
@@ -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
  *
  * ====================================================== 
@@ -18,9 +18,7 @@
 
 #include <config.h>
 
-#include <fstream>
-#include <sys/types.h>
-#include <utime.h>
+#include <algorithm>
 
 #include "bufferlist.h"
 #include "lyx_main.h"
 #include "lastfiles.h"
 #include "debug.h"
 #include "lyxrc.h"
-#include "lyxscreen.h"
 #include "lyxtext.h"
 #include "lyx_cb.h"
 #include "gettext.h"
 #include "LyXView.h"
 #include "vc-backend.h"
+#include "TextCache.h"
 
-extern BufferView * current_view;
-extern int RunLinuxDoc(int, string const &);
+extern BufferView * current_view; // called too many times in this file...
 
-using std::ifstream;
-using std::ofstream;
-using std::ios;
+using std::vector;
+using std::find;
+using std::endl;
 
 //
 // Class BufferStorage
@@ -51,23 +48,22 @@ using std::ios;
 
 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() << endl;
@@ -85,7 +81,7 @@ BufferList::BufferList()
 {}
 
 
-bool BufferList::empty()
+bool BufferList::empty() const
 {
        return bstore.empty();
 }
@@ -119,7 +115,7 @@ bool BufferList::QwriteAll()
                }
        }
         if (askMoreConfirmation &&
-            lyxrc->exit_confirmation &&
+            lyxrc.exit_confirmation &&
             !AskQuestion(_("Some documents were not saved:"),
                          unsaved, _("Exit anyway?"))) {
                 return false;
@@ -129,115 +125,13 @@ bool BufferList::QwriteAll()
 }
 
 
-// Should probably be moved to somewhere else: BufferView? LyXView?
-bool BufferList::write(Buffer * buf, bool makeBackup)
-{
-       if (buf->getUser())
-               buf->getUser()
-                       ->owner()
-                       ->getMiniBuffer()
-                       ->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 = new struct utimbuf;
-
-                       times->actime = finfo.getAccessTime();
-                       times->modtime = finfo.getModificationTime();
-                       ifstream ifs(buf->fileName().c_str());
-                       ofstream ofs(s.c_str(), ios::out|ios::trunc);
-                       if (ifs && ofs) {
-#if 1
-                               ofs << ifs.rdbuf();
-#else
-                               char c = 0;
-                               while (ifs.get(c)) {
-                                       ofs.put(c);
-                               }
-#endif
-                               ifs.close();
-                               ofs.close();
-                               chmod(s.c_str(), fmode);
-                               
-                               if (utime(s.c_str(), times)) {
-                                       lyxerr << "utime error." << endl;
-                               }
-                       } else {
-                               lyxerr << "LyX was not able to make "
-                                       "backupcopy. Beware." << endl;
-                       }
-                       delete times;
-               }
-       }
-       
-       if (buf->writeFile(buf->fileName(), false)) {
-               buf->markLyxClean();
-
-               current_view->owner()->getMiniBuffer()->
-                       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());
-               }
-               current_view->owner()->getMiniBuffer()->Set(_("Save failed!"));
-               return false;
-       }
-
-       return true;
-}
-
-
 void BufferList::closeAll()
 {
        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());
        }
@@ -259,23 +153,23 @@ bool BufferList::close(Buffer * buf)
         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?"))){
                case 1: // Yes
-                       if (write(buf, lyxrc->make_backup)) {
+                       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);
@@ -308,20 +202,6 @@ 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)->getUser()
-                   && (*it)->getUser()->text->UpdateInset(inset)) {
-                       if (mark_dirty)
-                               (*it)->markDirty();
-                       break;
-               }
-       }
-}
-
-
 int BufferList::unlockInset(UpdatableInset * inset)
 {
        if (!inset) return 1;
@@ -409,7 +289,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);
@@ -436,7 +316,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());
                        }
                }
        }
@@ -459,7 +339,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());
                                }
                        }
                }
@@ -476,17 +356,25 @@ 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();
@@ -500,14 +388,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);
@@ -539,26 +427,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:"), 
@@ -579,9 +447,11 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
        bool ro = false;
        switch (IsFileWriteable(s)) {
        case 0:
+#if 0
                current_view->owner()->getMiniBuffer()->
-                       Set(_("File `")+MakeDisplayPath(s, 50)+
-                       _("' is read-only."));
+                       Set(_("File `") + MakeDisplayPath(s, 50) +
+                           _("' is read-only."));
+#endif
                ro = true;
                // Fall through
        case 1: