]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
include shuffling and a mathed compile fix
[lyx.git] / src / bufferlist.C
index 99fcd4dd45370d9258f30b3f90e9e55a4c989e60..8455604fe9570b6e97f2eafb13e7084349f31c41 100644 (file)
@@ -4,30 +4,22 @@
  *           LyX, The Document Word Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team. 
+ *           Copyright 1995-2001 The LyX Team. 
  *
- *           This file is Copyright 1996-2000
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
  * ====================================================== 
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
-#include <algorithm>
-#include <functional>
-
 #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 "lyxtext.h"
 #include "lyx_cb.h"
 #include "bufferview_funcs.h"
+#include "BufferView.h"
 #include "gettext.h"
 #include "LyXView.h"
 #include "vc-backend.h"
 #include "TextCache.h"
 
+#include "frontends/Alert.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxmanip.h"
+#include "support/lyxfunctional.h"
+#include "support/LAssert.h"
+
+#include <assert.h>
+#include <algorithm>
+#include <functional>
+
+
 using std::vector;
 using std::find;
 using std::endl;
@@ -47,12 +53,15 @@ using std::find_if;
 using std::for_each;
 using std::mem_fun;
 
+extern BufferView * current_view;
+
 //
 // Class BufferStorage
 //
 
 void BufferStorage::release(Buffer * buf)
 {
+       lyx::Assert(buf);
        Container::iterator it = find(container.begin(), container.end(), buf);
        if (it != container.end()) {
                // Make sure that we don't store a LyXText in
@@ -70,8 +79,8 @@ Buffer * BufferStorage::newBuffer(string const & s, bool 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;
 }
@@ -92,59 +101,62 @@ bool BufferList::empty() const
 }
 
 
-extern bool MenuWrite(Buffer *);
-extern bool MenuWriteAs(Buffer *);
+bool BufferList::qwriteOne(Buffer * buf, string const & fname, string & unsaved_list)
+{
+       bool reask = true;
+       while (reask) {
+               switch (Alert::askConfirmation(_("Changes in document:"),
+                                      fname,
+                                      _("Save document?"))) {
+               case 1: // Yes
+                       // FIXME: WriteAs can be asynch !
+                       if (buf->isUnnamed())
+                               reask = !WriteAs(current_view, buf);
+                       else {
+                               reask = !MenuWrite(current_view, buf);
+                       }
+                       break;
+               case 2: // No
+                       // 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());
+                       }
+                       unsaved_list += MakeDisplayPath(fname, 50) + "\n";
+                       return true;
+               case 3: // Cancel
+                       return false;
+               }
+       }
+       return true;
+}
 
-bool BufferList::QwriteAll()
+bool BufferList::qwriteAll()
 {
-        bool askMoreConfirmation = false;
-        string unsaved;
+       string unsaved;
        for (BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
+            it != bstore.end(); ++it)
+       {
                if (!(*it)->isLyxClean()) {
                        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((*it));
-                                       else {
-                                               reask = !MenuWrite((*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 (!qwriteOne(*it, fname, unsaved)) // cancel the request!
+                               return false;
                }
        }
-        if (askMoreConfirmation &&
-            lyxrc.exit_confirmation &&
-            !AskQuestion(_("Some documents were not saved:"),
-                         unsaved, _("Exit anyway?"))) {
-                return false;
-        }
-
-        return true;
+       if (!unsaved.empty() && lyxrc.exit_confirmation) {
+               return Alert::askQuestion(_("Some documents were not saved:"),
+                                         unsaved, _("Exit anyway?"));
+       }
+
+       return true;
 }
 
 
@@ -162,14 +174,10 @@ void BufferList::closeAll()
 }
 
 
-void BufferList::resize()
-{
-       for_each(bstore.begin(), bstore.end(), mem_fun(&Buffer::resize));
-}
-
-
 bool BufferList::close(Buffer * buf)
 {
+       lyx::Assert(buf);
+       
        // CHECK
        // Trace back why we need to use buf->getUser here.
        // Perhaps slight rewrite is in order? (Lgb)
@@ -177,7 +185,7 @@ bool BufferList::close(Buffer * buf)
         if (buf->getUser()) buf->getUser()->insetUnlock();
        if (buf->paragraph && !buf->isLyxClean() && !quitting) {
                if (buf->getUser())
-                       ProhibitInput(buf->getUser());
+                       buf->getUser()->owner()->prohibitInput();
                string fname;
                if (buf->isUnnamed())
                        fname = OnlyFilename(buf->fileName());
@@ -185,18 +193,18 @@ bool BufferList::close(Buffer * buf)
                        fname = MakeDisplayPath(buf->fileName(), 50);
                bool reask = true;
                while (reask) {
-                       switch (AskConfirmation(_("Changes in document:"),
+                       switch (Alert::askConfirmation(_("Changes in document:"),
                                               fname,
                                               _("Save document?"))){
                        case 1: // Yes
                                if (buf->isUnnamed())
-                                       reask = !MenuWriteAs(buf);
+                                       reask = !WriteAs(current_view, buf);
                                else if (buf->save()) {
                                        lastfiles->newFile(buf->fileName());
                                        reask = false;
                                } else {
                                        if (buf->getUser())
-                                               AllowInput(buf->getUser());
+                                               buf->getUser()->owner()->allowInput();
                                        return false;
                                }
                                break;
@@ -208,12 +216,12 @@ bool BufferList::close(Buffer * buf)
                                break;
                        case 3: // Cancel
                                if (buf->getUser())
-                                       AllowInput(buf->getUser());
+                                       buf->getUser()->owner()->allowInput();
                                return false;
                        }
                }
                if (buf->getUser())
-                       AllowInput(buf->getUser());
+                       buf->getUser()->owner()->allowInput();
        }
 
        bstore.release(buf);
@@ -225,7 +233,7 @@ vector<string> const BufferList::getFileNames() const
 {
        vector<string> nvec;
        std::copy(bstore.begin(), bstore.end(),
-                 back_inserter_fun(nvec, &Buffer::fileName));
+                 lyx::back_inserter_fun(nvec, &Buffer::fileName));
        return nvec;
 }
 
@@ -246,7 +254,9 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 
 int BufferList::unlockInset(UpdatableInset * inset)
 {
-       if (!inset) return 1;
+       lyx::Assert(inset);
+       
+       //if (!inset) return 1;
        for (BufferStorage::iterator it = bstore.begin();
             it != bstore.end(); ++it) {
                if ((*it)->getUser()
@@ -278,12 +288,17 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 void BufferList::emergencyWriteAll()
 {
        for_each(bstore.begin(), bstore.end(),
-                class_fun(*this, &BufferList::emergencyWrite));
+                lyx::class_fun(*this, &BufferList::emergencyWrite));
 }
 
 
 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
+
+       
        // No need to save if the buffer has not changed.
        if (buf->isLyxClean()) return;
        
@@ -345,6 +360,12 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        // File information about normal file
        FileInfo fileInfo2(s);
 
+       if (!fileInfo2.exist()) {
+               Alert::alert(_("Error!"), _("Cannot open file"), 
+                       MakeDisplayPath(s));
+               return 0;
+       }
        // Check if emergency save file exists and is newer.
        e += OnlyFilename(s) + ".emergency";
        FileInfo fileInfoE(e);
@@ -354,7 +375,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        if (fileInfoE.exist() && fileInfo2.exist()) {
                if (fileInfoE.getModificationTime()
                    > fileInfo2.getModificationTime()) {
-                       if (AskQuestion(_("An emergency save of this document exists!"),
+                       if (Alert::askQuestion(_("An emergency save of this document exists!"),
                                        MakeDisplayPath(s, 50),
                                        _("Try to load that instead?"))) {
                                ts = e;
@@ -378,7 +399,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
                if (fileInfoA.exist() && fileInfo2.exist()) {
                        if (fileInfoA.getModificationTime()
                            > fileInfo2.getModificationTime()) {
-                               if (AskQuestion(_("Autosave file is newer."),
+                               if (Alert::askQuestion(_("Autosave file is newer."),
                                                MakeDisplayPath(s, 50),
                                                _("Load that one instead?"))) {
                                        ts = a;
@@ -407,12 +428,15 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
 bool BufferList::exists(string const & s) const
 {
        return find_if(bstore.begin(), bstore.end(),
-                      compare_memfun(&Buffer::fileName, s)) != bstore.end();
+                      lyx::compare_memfun(&Buffer::fileName, s))
+               != bstore.end();
 }
 
 
 bool BufferList::isLoaded(Buffer const * b) const
 {
+       lyx::Assert(b);
+       
        BufferStorage::const_iterator cit =
                find(bstore.begin(), bstore.end(), b);
        return cit != bstore.end();
@@ -423,7 +447,7 @@ Buffer * BufferList::getBuffer(string const & s)
 {
        BufferStorage::iterator it =
                find_if(bstore.begin(), bstore.end(),
-                       compare_memfun(&Buffer::fileName, s));
+                       lyx::compare_memfun(&Buffer::fileName, s));
        return it != bstore.end() ? (*it) : 0;
 }
 
@@ -437,23 +461,23 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
        if (tname.empty()) {
                tname = LibFileSearch("templates", "defaults.lyx");
        }
-       if (!tname.empty() && IsLyXFilename(tname)) {
+       if (!tname.empty()) {
                bool templateok = false;
                LyXLex lex(0, 0);
                lex.setFile(tname);
-               if (lex.IsOK()) {
+               if (lex.isOK()) {
                        if (b->readFile(lex)) {
                                templateok = true;
                        }
                }
                if (!templateok) {
-                       WriteAlert(_("Error!"), _("Unable to open template"), 
+                       Alert::alert(_("Error!"), _("Unable to open template"), 
                                   MakeDisplayPath(tname));
                        // no template, start with empty buffer
-                       b->paragraph = new LyXParagraph;
+                       b->paragraph = new Paragraph;
                }
        } else {  // start with empty buffer
-               b->paragraph = new LyXParagraph;
+               b->paragraph = new Paragraph;
        }
 
        if (!lyxrc.new_ask_filename && !isNamed) {
@@ -469,12 +493,16 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
 
 Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
 {
-       // make sure our path is absolute
-       string const s = MakeAbsPath(filename);
+       // get absolute path of file and add ".lyx" to the filename if
+       // necessary
+       string s = FileSearch(string(), filename, "lyx");
+       if (s.empty()) {
+               s = filename;
+       }
 
        // file already open?
        if (exists(s)) {
-               if (AskQuestion(_("Document is already open:"), 
+               if (Alert::askQuestion(_("Document is already open:"), 
                                MakeDisplayPath(s, 50),
                                _("Do you want to reload that document?"))) {
                        // Reload is accomplished by closing and then loading
@@ -492,11 +520,6 @@ 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."));
-#endif
                ro = true;
                // Fall through
        case 1:
@@ -510,7 +533,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 retrieve file under version control?"))) {
+                       if (Alert::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.
@@ -518,7 +541,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                                return loadLyXFile(filename, tolastfiles);
                        }
                }
-               if (AskQuestion(_("Cannot open specified file:"), 
+               if (Alert::askQuestion(_("Cannot open specified file:"), 
                                MakeDisplayPath(s, 50),
                                _("Create new document with this name?")))
                        {