Remove the inset and view member functions from PreviewedInset.

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 6ddbbd4c31fd52d03c489783b7c98289a9b7b2b4..b7eafa9d9663223a7f89083ecc79dc97c681f35f 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -22,6 +22,8 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
+#include "cursor.h"
 #include "debug.h"
 #include "factory.h"
 #include "FloatList.h"
@@ -41,6 +43,7 @@
 #include "ParagraphParameters.h"
 #include "TextCache.h"
 #include "undo_funcs.h"
+#include "vspace.h"
 
 #include "insets/insetfloatlist.h"
 #include "insets/insetref.h"
@@ -64,14 +67,33 @@
 
 #include <boost/bind.hpp>
 
+using bv_funcs::bold;
+using bv_funcs::code;
+using bv_funcs::currentState;
+using bv_funcs::emph;
+using bv_funcs::fontSize;
+using bv_funcs::lang;
+using bv_funcs::noun;
+using bv_funcs::roman;
+using bv_funcs::sans;
+using bv_funcs::styleReset;
+using bv_funcs::underline;
+
+using lyx::pos_type;
+
+using lyx::support::AddPath;
+using lyx::support::bformat;
+using lyx::support::FileSearch;
+using lyx::support::IsDirWriteable;
+using lyx::support::MakeDisplayPath;
+using lyx::support::strToUnsignedInt;
+using lyx::support::system_lyxdir;
 
 using std::endl;
 using std::make_pair;
 using std::min;
+using std::string;
 
-using lyx::pos_type;
-using namespace lyx::support;
-using namespace bv_funcs;
 
 extern BufferList bufferlist;
 
@@ -336,7 +358,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
        if (buffer_) {
                // Don't forget to update the Layout
                string const layoutname =
-                       bv_->text->cursor.par()->layout()->name();
+                       bv_->text->cursorPar()->layout()->name();
                owner_->setLayout(layoutname);
        }
 
@@ -382,9 +404,9 @@ void BufferView::Pimpl::resizeCurrentBuffer()
 {
        lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
 
-       ParagraphList::iterator par;
-       ParagraphList::iterator selstartpar;
-       ParagraphList::iterator selendpar;
+       int par = -1;
+       int selstartpar = -1;
+       int selendpar = -1;
        UpdatableInset * the_locking_inset = 0;
 
        pos_type pos = 0;
@@ -429,17 +451,13 @@ void BufferView::Pimpl::resizeCurrentBuffer()
                        bv_->text = new LyXText(bv_, 0, false, bv_->buffer()->paragraphs());
                        bv_->text->init(bv_);
                }
-
-               par = bv_->text->ownerParagraphs().end();
-               selstartpar = bv_->text->ownerParagraphs().end();
-               selendpar = bv_->text->ownerParagraphs().end();
        }
 
 #warning does not help much
-       bv_->text->redoParagraphs(bv_->text->ownerParagraphs().begin(),
-               bv_->text->ownerParagraphs().end());
+       //bv_->text->redoParagraphs(bv_->text->ownerParagraphs().begin(),
+       //      bv_->text->ownerParagraphs().end());
 
-       if (par != bv_->text->ownerParagraphs().end()) {
+       if (par != -1) {
                bv_->text->selection.set(true);
                // At this point just to avoid the Delete-Empty-Paragraph-
                // Mechanism when setting the cursor.
@@ -635,7 +653,7 @@ void BufferView::Pimpl::workAreaResize()
 
 void BufferView::Pimpl::update()
 {
-       lyxerr << "BufferView::update()" << endl;
+       //lyxerr << "BufferView::update()" << endl;
        // fix cursor coordinate cache in case something went wrong
        if (bv_->getLyXText()) {
                // check needed to survive LyX startup
@@ -677,8 +695,8 @@ Change const BufferView::Pimpl::getCurrentChange()
        if (!text->selection.set())
                return Change(Change::UNCHANGED);
 
-       LyXCursor const & cur = text->selection.start;
-       return cur.par()->lookupChangeFull(cur.pos());
+       return text->getPar(text->selection.start)
+               ->lookupChangeFull(text->selection.start.pos());
 }
 
 
@@ -693,7 +711,7 @@ void BufferView::Pimpl::savePosition(unsigned int i)
        if (i >= saved_positions_num)
                return;
        saved_positions[i] = Position(buffer_->fileName(),
-                                     bv_->text->cursor.par()->id(),
+                                     bv_->text->cursorPar()->id(),
                                      bv_->text->cursor.pos());
        if (i > 0)
                owner_->message(bformat(_("Saved bookmark %1$s"), tostr(i)));
@@ -710,14 +728,14 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
        beforeChange(bv_->text);
 
        if (fname != buffer_->fileName()) {
-               Buffer * b;
+               Buffer * b = 0;
                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)
+               if (b)
                        buffer(b);
        }
 
@@ -815,7 +833,7 @@ InsetOld * BufferView::Pimpl::getInsetByCode(InsetOld::Code code)
        LyXCursor cursor = bv_->getLyXText()->cursor;
        Buffer::inset_iterator it =
                find_if(Buffer::inset_iterator(
-                       cursor.par(), cursor.pos()),
+                       cursorPar(), cursor.pos()),
                        buffer_->inset_iterator_end(),
                        lyx::compare_memfun(&Inset::lyxCode, code));
        return it != buffer_->inset_iterator_end() ? (*it) : 0;
@@ -824,22 +842,22 @@ InsetOld * BufferView::Pimpl::getInsetByCode(InsetOld::Code code)
        // should work for now. Better infrastructure is coming. (Lgb)
 
        Buffer * b = bv_->buffer();
-       LyXCursor cursor = bv_->getLyXText()->cursor;
+       LyXText * text =  bv_->getLyXText();
 
        Buffer::inset_iterator beg = b->inset_iterator_begin();
        Buffer::inset_iterator end = b->inset_iterator_end();
 
-       bool cursor_par_seen = false;
+       bool cursorPar_seen = false;
 
        for (; beg != end; ++beg) {
-               if (beg.getPar() == cursor.par()) {
-                       cursor_par_seen = true;
+               if (beg.getPar() == text->cursorPar()) {
+                       cursorPar_seen = true;
                }
-               if (cursor_par_seen) {
-                       if (beg.getPar() == cursor.par()
-                           && beg.getPos() >= cursor.pos()) {
+               if (cursorPar_seen) {
+                       if (beg.getPar() == text->cursorPar()
+                           && beg.getPos() >= text->cursor.pos()) {
                                break;
-                       } else if (beg.getPar() != cursor.par()) {
+                       } else if (beg.getPar() != text->cursorPar()) {
                                break;
                        }
                }
@@ -926,7 +944,7 @@ void BufferView::Pimpl::trackChanges()
                buf->undostack().clear();
        } else {
                update();
-               bv_->text->setCursor(buf->paragraphs().begin(), 0);
+               bv_->text->setCursor(0, 0);
 #warning changes FIXME
                //moveCursorUpdate(false);
 
@@ -1205,7 +1223,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
 
        case LFUN_LAYOUT_PARAGRAPH: {
                string data;
-               params2string(*bv_->getLyXText()->cursor.par(), data);
+               params2string(*bv_->getLyXText()->cursorPar(), data);
 
                data = "show\n" + data;
                bv_->owner()->getDialogs().show("paragraph", data);
@@ -1215,7 +1233,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
        case LFUN_PARAGRAPH_UPDATE: {
                if (!bv_->owner()->getDialogs().visible("paragraph"))
                        break;
-               Paragraph const & par = *bv_->getLyXText()->cursor.par();
+               Paragraph const & par = *bv_->getLyXText()->cursorPar();
 
                string data;
                params2string(par, data);
@@ -1264,7 +1282,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                break;
 
        case LFUN_ACCEPT_ALL_CHANGES: {
-               bv_->text->setCursor(bv_->buffer()->paragraphs().begin(), 0);
+               bv_->text->setCursor(0, 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
@@ -1276,7 +1294,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
        }
 
        case LFUN_REJECT_ALL_CHANGES: {
-               bv_->text->setCursor(bv_->buffer()->paragraphs().begin(), 0);
+               bv_->text->setCursor(0, 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
@@ -1329,7 +1347,7 @@ bool BufferView::Pimpl::insertInset(InsetOld * inset, string const & lout)
        if (!lout.empty()) {
                bv_->text->breakParagraph(bv_->buffer()->paragraphs());
 
-               if (!bv_->text->cursor.par()->empty()) {
+               if (!bv_->text->cursorPar()->empty()) {
                        bv_->text->cursorLeft(bv_);
                        bv_->text->breakParagraph(bv_->buffer()->paragraphs());
                }
@@ -1374,7 +1392,7 @@ void BufferView::Pimpl::updateInset(InsetOld const * inset)
        bv_->text->redoParagraph(outerPar(*bv_->buffer(), inset));
 
        // this should not be needed, but it is...
-       // bv_->text->redoParagraph(bv_->text->cursor.par());
+       // bv_->text->redoParagraph(bv_->text->cursorPar());
        // bv_->text->fullRebreak();
 
        update();
@@ -1411,10 +1429,10 @@ bool BufferView::Pimpl::ChangeInsets(InsetOld::Code code,
                        // FIXME
 
                        // The test it.size()==1 was needed to prevent crashes.
-                       // How to set the cursor corretly when it.size()>1 ??
+                       // How to set the cursor correctly when it.size()>1 ??
                        if (it.size() == 1) {
-                               bv_->text->setCursorIntern(it.pit(), 0);
-                               bv_->text->redoParagraph(bv_->text->cursor.par());
+                               bv_->text->setCursorIntern(bv_->text->parOffset(it.pit()), 0);
+                               bv_->text->redoParagraph(bv_->text->cursorPar());
                        }
                }
        }