get rid of broken_header.h and some unneeded tests

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index e1176d8f3277fd1a3e7b6cd47f00f56fbf18414e..2be15d5e9009e3e493bc6c649a330df6f615f08f 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -21,6 +21,7 @@
 #include "bufferparams.h"
 #include "BufferView_pimpl.h"
 #include "CutAndPaste.h"
+#include "coordcache.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"
@@ -47,11 +48,7 @@
 #include "insets/updatableinset.h"
 #include "insets/insettext.h"
 
-#include "support/filetools.h"
-#include "support/lyxalgo.h" // lyx_count
-
 using lyx::support::bformat;
-using lyx::support::MakeAbsPath;
 
 using lyx::cap::setSelectionRange;
 
@@ -65,9 +62,8 @@ using std::vector;
 extern BufferList bufferlist;
 
 
-BufferView::BufferView(LyXView * owner, int xpos, int ypos,
-                      int width, int height)
-       : pimpl_(new Pimpl(*this, owner, xpos, ypos, width, height))
+BufferView::BufferView(LyXView * owner, int width, int height)
+       : pimpl_(new Pimpl(*this, owner, width, height))
 {}
 
 
@@ -146,9 +142,9 @@ bool BufferView::fitCursor()
 }
 
 
-void BufferView::update()
+void BufferView::update(bool fitcursor, bool forceupdate)
 {
-       pimpl_->update();
+       pimpl_->update(fitcursor, forceupdate);
 }
 
 
@@ -164,12 +160,6 @@ void BufferView::scrollDocView(int value)
 }
 
 
-void BufferView::redoCurrentBuffer()
-{
-       pimpl_->redoCurrentBuffer();
-}
-
-
 bool BufferView::available() const
 {
        return pimpl_->available();
@@ -218,18 +208,6 @@ void BufferView::center()
 }
 
 
-int BufferView::top_y() const
-{
-       return pimpl_->top_y();
-}
-
-
-void BufferView::top_y(int y)
-{
-       pimpl_->top_y(y);
-}
-
-
 string const BufferView::getClipboard() const
 {
        return pimpl_->workarea().getClipboard();
@@ -260,30 +238,6 @@ void BufferView::scroll(int lines)
 }
 
 
-// Inserts a file into current document
-bool BufferView::insertLyXFile(string const & filen)
-       //
-       // Copyright CHT Software Service GmbH
-       // Uwe C. Schroeder
-       //
-       // Insert a LyXformat - file into current buffer
-       //
-       // Moved from lyx_cb.C (Lgb)
-{
-       BOOST_ASSERT(!filen.empty());
-
-       string const fname = MakeAbsPath(filen);
-
-       cursor().clearSelection();
-       text()->breakParagraph(cursor());
-
-       BOOST_ASSERT(cursor().inTexted());
-       bool res = buffer()->readFile(fname, cursor().par());
-       resize();
-       return res;
-}
-
-
 void BufferView::showErrorList(string const & action) const
 {
        if (getErrorList().size()) {
@@ -311,8 +265,7 @@ void BufferView::setCursorFromRow(int row)
        if (tmpid == -1)
                text()->setCursor(cursor(), 0, 0);
        else
-               text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(),
-                       tmppos);
+               text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(), tmppos);
 }
 
 
@@ -323,7 +276,7 @@ void BufferView::gotoLabel(string const & label)
                it->getLabelList(*buffer(), labels);
                if (find(labels.begin(),labels.end(),label) != labels.end()) {
                        cursor().clearSelection();
-                       text()->setCursor(cursor(), it.par(), it.pos());
+                       text()->setCursor(cursor(), it.pit(), it.pos());
                        cursor().resetAnchor();
                        update();
                        return;
@@ -346,14 +299,6 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-Language const * BufferView::getParentLanguage(InsetOld * inset) const
-{
-       Paragraph const & par = ownerPar(*buffer(), inset);
-       return par.getFontSettings(buffer()->params(),
-                                  par.getPositionOfInset(inset)).language();
-}
-
-
 void BufferView::haveSelection(bool sel)
 {
        pimpl_->workarea().haveSelection(sel);
@@ -374,28 +319,14 @@ LyXText * BufferView::text() const
 
 void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos)
 {
-       int const last = par.size();
-       for (int i = 0; i < last; ++i)
+       for (int i = 0, n = par.size(); i < n; ++i)
                par[i].inset().edit(cursor(), true);
 
-       cursor().setCursor(makeDocIterator(par, pos), false);
+       cursor().setCursor(makeDocIterator(par, pos));
+       cursor().selection() = false;
 }
 
 
-/*
-if the fitCursor call refers to some point in never-explored-land, then we
-don't have y information in insets there, then we cannot even do an update
-to get it (because we need the y infomation for setting top_y first). So
-this is solved in putSelectionAt with:
-
-- setting top_y to the y of the outerPar (that has good info)
-- calling update
-- calling cursor().updatePos()
-- then call fitCursor()
-
-Ab.
-*/
-
 void BufferView::putSelectionAt(DocIterator const & cur,
                                int length, bool backwards)
 {
@@ -403,28 +334,15 @@ void BufferView::putSelectionAt(DocIterator const & cur,
 
        cursor().clearSelection();
 
-       LyXText & text = *cur[0].text();
        setCursor(par, cur.pos());
-       
-       // hack for the chicken and egg problem
-       top_y(text.getPar(par.outerPar()).y);
-
-       update();
-       //text.setCursor(cursor(), cur.par(), cur.pos());
-       cursor().updatePos();
 
        if (length) {
                if (backwards) {
+                       cursor().pos() += length;
                        cursor().setSelection(cursor(), -length);
-                       DocIterator const it = cursor();
-                       cursor().setCursor(cursor().anchor_, true);
-                       cursor().anchor_ = it;
                } else
                        cursor().setSelection(cursor(), length);
        }
-
-       fitCursor();
-       update();
 }
 
 
@@ -438,3 +356,15 @@ LCursor const & BufferView::cursor() const
 {
        return pimpl_->cursor_;
 }
+
+
+lyx::pit_type BufferView::anchor_ref() const
+{
+       return pimpl_->anchor_ref_;
+}
+
+
+int BufferView::offset_ref() const
+{
+       return pimpl_->offset_ref_;
+}