X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=01cfc41d8eef8fbf3e737869f29d0133340a3e2b;hb=e94889a041628203c50b66b9a4add63210de6928;hp=a0b4084495f76ba853593da9be8fd6e6a1e24fee;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/BufferView.C b/src/BufferView.C
index a0b4084495..01cfc41d8e 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -21,16 +21,19 @@
 #include "bufferparams.h"
 #include "BufferView_pimpl.h"
 #include "CutAndPaste.h"
+#include "coordcache.h"
 #include "debug.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
 #include "gettext.h"
-#include "iterators.h"
+#include "insetiterator.h"
 #include "language.h"
 #include "lyxlayout.h"
 #include "lyxtext.h"
 #include "lyxtextclass.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
+#include "pariterator.h"
 #include "texrow.h"
 #include "undo.h"
 #include "WordLangTuple.h"
@@ -42,14 +45,9 @@
 #include "frontends/WorkArea.h"
 
 #include "insets/insetcommand.h" // ChangeRefs
-#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;
 
@@ -63,9 +61,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))
 {}
 
 
@@ -144,9 +141,9 @@ bool BufferView::fitCursor()
 }
 
 
-void BufferView::update()
+void BufferView::update(Update::flags flags)
 {
-	pimpl_->update();
+	pimpl_->update(flags);
 }
 
 
@@ -162,12 +159,6 @@ void BufferView::scrollDocView(int value)
 }
 
 
-void BufferView::redoCurrentBuffer()
-{
-	pimpl_->redoCurrentBuffer();
-}
-
-
 bool BufferView::available() const
 {
 	return pimpl_->available();
@@ -197,6 +188,10 @@ bool BufferView::isSavedPosition(unsigned int i)
 	return pimpl_->isSavedPosition(i);
 }
 
+void BufferView::saveSavedPositions()
+{
+	return pimpl_->saveSavedPositions();
+}
 
 void BufferView::switchKeyMap()
 {
@@ -216,70 +211,70 @@ void BufferView::center()
 }
 
 
-int BufferView::top_y() const
+string const BufferView::getClipboard() const
 {
-	return pimpl_->top_y();
+	return pimpl_->workarea().getClipboard();
 }
 
 
-void BufferView::top_y(int y)
+void BufferView::stuffClipboard(string const & stuff) const
 {
-	pimpl_->top_y(y);
+	pimpl_->stuffClipboard(stuff);
 }
 
 
-string const BufferView::getClipboard() const
+FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 {
-	return pimpl_->workarea().getClipboard();
+	return pimpl_->getStatus(cmd);
 }
 
 
-void BufferView::stuffClipboard(string const & stuff) const
+bool BufferView::dispatch(FuncRequest const & ev)
 {
-	pimpl_->stuffClipboard(stuff);
+	return pimpl_->dispatch(ev);
 }
 
 
-bool BufferView::dispatch(FuncRequest const & ev)
+void BufferView::selectionRequested()
 {
-	return pimpl_->dispatch(ev);
+        pimpl_->selectionRequested();
 }
 
 
-void BufferView::scroll(int lines)
+void BufferView::selectionLost()
 {
-	pimpl_->scroll(lines);
+        pimpl_->selectionLost();
 }
 
 
-// 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)
+void BufferView::workAreaResize()
 {
-	BOOST_ASSERT(!filen.empty());
+        pimpl_->workAreaResize();
+}
 
-	string const fname = MakeAbsPath(filen);
 
-	cursor().clearSelection();
-	text()->breakParagraph(cursor());
+void BufferView::workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state)
+{
+        pimpl_->workAreaKeyPress(key, state);
+}
+
+
+bool BufferView::workAreaDispatch(FuncRequest const & ev)
+{
+        return pimpl_->workAreaDispatch(ev);
+}
+
 
-	BOOST_ASSERT(cursor().inTexted());
-	bool res = buffer()->readFile(fname, cursor().par());
-	resize();
-	return res;
+void BufferView::scroll(int lines)
+{
+	pimpl_->scroll(lines);
 }
 
 
 void BufferView::showErrorList(string const & action) const
 {
 	if (getErrorList().size()) {
-		string const title = bformat(_("LyX: %1$s errors (%2$s)"),
+		string const title = bformat(_("%1$s Errors (%2$s)"),
 			action, buffer()->fileName());
 		owner()->getDialogs().show("errorlist", title);
 		pimpl_->errorlist_.clear();
@@ -303,21 +298,17 @@ 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);
 }
 
 
 void BufferView::gotoLabel(string const & label)
 {
-	for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
-	     it != buffer()->inset_iterator_end(); ++it) {
+	for (InsetIterator it = inset_iterator_begin(buffer()->inset()); it; ++it) {
 		vector<string> labels;
 		it->getLabelList(*buffer(), labels);
 		if (find(labels.begin(),labels.end(),label) != labels.end()) {
-			cursor().clearSelection();
-			text()->setCursor(cursor(), it.getPar(), it.getPos());
-			cursor().resetAnchor();
+			setCursor(it);
 			update();
 			return;
 		}
@@ -330,8 +321,7 @@ void BufferView::hideCursor()
 	screen().hideCursor();
 }
 
-
-LyXText * BufferView::getLyXText() const
+LyXText * BufferView::getLyXText()
 {
 	LyXText * text = cursor().innerText();
 	BOOST_ASSERT(text);
@@ -339,11 +329,11 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-Language const * BufferView::getParentLanguage(InsetOld * inset) const
+LyXText const * BufferView::getLyXText() const
 {
-	Paragraph const & par = ownerPar(*buffer(), inset);
-	return par.getFontSettings(buffer()->params(),
-	                           par.getPositionOfInset(inset)).language();
+	LyXText const * text = cursor().innerText();
+	BOOST_ASSERT(text);
+	return text;
 }
 
 
@@ -365,62 +355,63 @@ LyXText * BufferView::text() const
 }
 
 
-void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos)
+void BufferView::setCursor(DocIterator const & dit)
 {
-	LCursor & cur = cursor();
-	cur.reset(buffer()->inset());
-	ParIterator::PosHolder const & positions = par.positions();
-	int const last = par.size() - 1;
-	for (int i = 0; i < last; ++i)
-		(*positions[i].it)->inset->edit(cur, true);
-	cur.resetAnchor();
-	par.text(*buffer())->setCursor(cur, par.pit(), pos);
+	size_t const n = dit.depth();
+	for (size_t i = 0; i < n; ++i)
+		dit[i].inset().edit(cursor(), true);
+
+	cursor().setCursor(dit);
+	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:
+void BufferView::mouseSetCursor(LCursor & cur)
+{
+	BOOST_ASSERT(&cur.bv() == this);
 
-- setting top_y to the y of the outerPar (that has good info)
-- calling update
-- calling cursor().updatePos()
-- then call fitCursor()
+	// Has the cursor just left the inset?
+	if (&cursor().inset() != &cur.inset())
+		cursor().inset().notifyCursorLeaves(cursor());
 
-Ab.
-*/
+	// do the dEPM magic if needed
+	if (cursor().inTexted())
+		cursor().text()->deleteEmptyParagraphMechanism(cur, cursor());
 
-void BufferView::putSelectionAt(DocumentIterator const & cur,
-		      int length, bool backwards)
-{
-	ParIterator par(cur);
+	cursor() = cur;
+	cursor().clearSelection();
+	cursor().setTargetX();
+	finishUndo();
+
+}
 
+
+void BufferView::putSelectionAt(DocIterator const & cur,
+				int length, bool backwards)
+{
 	cursor().clearSelection();
 
-	LyXText * text = par.text(*buffer());
-	setCursor(par, cur.pos());
-	
-	// hack for the chicken and egg problem
-	if (par.inset())
-		top_y(text->getPar(par.outerPar()).y);
-	update();
-	text->setCursor(cursor(), cur.par(), cur.pos());
-	cursor().updatePos();
+	setCursor(cur);
 
 	if (length) {
-		setSelectionRange(cursor(), length);
-		cursor().setSelection();
 		if (backwards) {
-			DocumentIterator const it = cursor();
-			cursor().setCursor(cursor().anchor_, false);
-			cursor().anchor_ = it;
-		}
+			cursor().pos() += length;
+			cursor().setSelection(cursor(), -length);
+		} else
+			cursor().setSelection(cursor(), length);
 	}
+}
+
+
+bool const BufferView::repaintAll() const
+{
+	return pimpl_->repaintAll();
+}
+
 
-	fitCursor();
-	update();
+void const BufferView::repaintAll(bool r) const
+{
+	pimpl_->repaintAll(r);
 }
 
 
@@ -434,3 +425,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_;
+}