move some selection related stuff over to textcursor.C

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index f8f8fd4bbcad0e4108f3c547a03aa7ef8a1ca20d..59c7df3c5a7f42f13d868b0832d22c2ece3ea5df 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -11,6 +11,7 @@
 #include "BufferView_pimpl.h"
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferview_funcs.h"
 #include "lfuns.h"
 #include "debug.h"
@@ -28,6 +29,7 @@
 #include "lyxtext.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
+#include "lastfiles.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
 #include "TextCache.h"
@@ -128,6 +130,76 @@ BufferView::Pimpl::Pimpl(BufferView * bv, LyXView * owner,
 }
 
 
+void BufferView::Pimpl::addError(ErrorItem const & ei)
+{
+       errorlist_.push_back(ei);
+
+}
+
+
+bool BufferView::Pimpl::loadLyXFile(string const & filename, bool tolastfiles)
+{
+       // 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 (bufferlist.exists(s)) {
+               string const file = MakeDisplayPath(s, 20);
+               string text = bformat(_("The document %1$s is already "
+                                       "loaded.\n\nDo you want to revert "
+                                       "to the saved version?"), file);
+               int const ret = Alert::prompt(_("Revert to saved document?"),
+                       text, 0, 1,  _("&Revert"), _("&Switch to document"));
+
+               if (ret != 0) {
+                       buffer(bufferlist.getBuffer(s));
+                       return true;
+               } else {
+                       // FIXME: should be LFUN_REVERT
+                       if (!bufferlist.close(bufferlist.getBuffer(s), false))
+                               return false;
+                       // Fall through to new load. (Asger)
+               }
+       }
+       Buffer * b = bufferlist.newBuffer(s);
+
+       //attach to the error signal in the buffer
+       b->parseError.connect(boost::bind(&BufferView::Pimpl::addError, 
+                                         this, _1));
+
+       bool loaded = ::loadLyXFile(b, s);
+
+       if (! loaded) {
+               bufferlist.release(b);
+               string text = bformat(_("The document %1$s does "
+                                       "not yet exist.\n\n"
+                                       "Do you want to create "
+                                       "a new document?"), s);
+               int const ret = Alert::prompt(_("Create new document?"),
+                        text, 0, 1, _("&Create"), _("Cancel"));
+
+               if (ret == 0)
+                       b = newFile(s, string(), true);
+               else
+                       return false;
+
+       } 
+
+       buffer(b);
+
+       if (tolastfiles)
+               lastfiles->newFile(b->fileName());
+
+       if (loaded)
+               bv_->showErrorList(_("Parse"));
+
+       return true;
+}
+
 WorkArea & BufferView::Pimpl::workarea() const
 {
        return *workarea_.get();
@@ -186,7 +258,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                }
 
                // FIXME: needed when ?
-               bv_->text->top_y(screen().topCursorVisible(bv_->text->cursor, bv_->text->top_y()));
+               bv_->text->top_y(screen().topCursorVisible(bv_->text));
 
                // Buffer-dependent dialogs should be updated or
                // hidden. This should go here because some dialogs (eg ToC)
@@ -286,8 +358,8 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                mark_set = bv_->text->selection.mark();
                the_locking_inset = bv_->theLockingInset();
                buffer_->resizeInsets(bv_);
-               // I don't think the delete and new are necessary here we just could
-               // call only init! (Jug 20020419)
+               // I don't think the delete and new are necessary here we 
+               // just could call only init! (Jug 20020419)
                delete bv_->text;
                bv_->text = new LyXText(bv_);
                bv_->text->init(bv_);
@@ -337,7 +409,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                bv_->theLockingInset(the_locking_inset);
        }
 
-       bv_->text->top_y(screen().topCursorVisible(bv_->text->cursor, bv_->text->top_y()));
+       bv_->text->top_y(screen().topCursorVisible(bv_->text));
 
        switchKeyMap();
        owner_->busy(false);
@@ -545,7 +617,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
                text->selection.cursor = text->cursor;
        }
 
-       text->fullRebreak();
+       text->partialRebreak();
 
        if (text->inset_owner) {
                text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
@@ -564,7 +636,7 @@ void BufferView::Pimpl::update(BufferView::UpdateCodes f)
                text->selection.cursor = text->cursor;
        }
 
-       text->fullRebreak();
+       text->partialRebreak();
 
        if (text->inset_owner) {
                text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
@@ -641,10 +713,15 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
        beforeChange(bv_->text);
 
        if (fname != buffer_->fileName()) {
-               Buffer * b = bufferlist.exists(fname) ?
-                       bufferlist.getBuffer(fname) :
-                       bufferlist.loadLyXFile(fname); // don't ask, just load it
-               if (b != 0) buffer(b);
+               Buffer * b;
+               if (bufferlist.exists(fname))
+                       b = bufferlist.getBuffer(fname);
+               else {
+                       b = bufferlist.newBuffer(fname);
+                       ::loadLyXFile(b, fname); // don't ask, just load it
+               }
+               if (b != 0) 
+                       buffer(b);
        }
 
        ParIterator par = buffer_->getParFromID(saved_positions[i].par_id);
@@ -861,7 +938,7 @@ void BufferView::Pimpl::trackChanges()
 
        if (!tracking) {
                ParIterator const end = buf->par_iterator_end();
-               for (ParIterator it = buf->par_iterator_begin(); it != end; ++it) 
+               for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
                        it->trackChanges();
                buf->params.tracking_changes = true;