X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.C;h=498d1c982f12a8fd6da67bd8aadf7f4460c036d0;hb=ee1871ef714a0c2a85127375ccd0488b831a9d35;hp=8fe21d9e616c7fff7e3f9ab99ecc521dbea25a19;hpb=6238e20d09ad90b340148d3d04e16adc7833891b;p=lyx.git

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 8fe21d9e61..498d1c982f 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -14,6 +14,7 @@
 #include "rowpainter.h"
 
 #include "buffer.h"
+#include "coordcache.h"
 #include "cursor.h"
 #include "debug.h"
 #include "bufferparams.h"
@@ -32,62 +33,68 @@
 #include "vspace.h"
 
 #include "frontends/font_metrics.h"
+#include "frontends/nullpainter.h"
+#include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
 
 #include "support/textutils.h"
 
+#include <boost/crc.hpp>
+
+using lyx::frontend::Painter;
+using lyx::frontend::NullPainter;
+using lyx::char_type;
 using lyx::pos_type;
+using lyx::pit_type;
 
 using std::endl;
 using std::max;
+using std::min;
 using std::string;
 
-extern int NEST_MARGIN;
-extern int CHANGEBAR_MARGIN;
 
 namespace {
 
+/// Flag: do a full redraw of inside text of inset
+/// Working variable indicating a full screen refresh
+bool refreshInside;
+
 /**
  * A class used for painting an individual row of text.
  */
 class RowPainter {
 public:
 	/// initialise and run painter
-	RowPainter(BufferView const & bv, LyXText const & text,
-		ParagraphList::iterator pit, RowList::iterator rit, int xo, int yo);
-private:
+	RowPainter(PainterInfo & pi, LyXText const & text,
+		pit_type pit, Row const & row, int x, int y);
+
 	// paint various parts
-	void paintBackground();
-	void paintSelection();
 	void paintAppendix();
 	void paintDepthBar();
 	void paintChangeBar();
 	void paintFirst();
 	void paintLast();
-	void paintForeignMark(double orig_x, LyXFont const & orig_font);
-	void paintHebrewComposeChar(lyx::pos_type & vpos);
-	void paintArabicComposeChar(lyx::pos_type & vpos);
-	void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
-	int paintAppendixStart(int y);
 	void paintText();
+
+private:
+	void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
+	void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font);
+	void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font);
+	void paintChars(lyx::pos_type & vpos, LyXFont font,
+			bool hebrew, bool arabic);
+	int paintAppendixStart(int y);
 	void paintFromPos(lyx::pos_type & vpos);
-	void paintInset(lyx::pos_type const pos);
+	void paintInset(lyx::pos_type const pos, LyXFont const & font);
 
 	/// return left margin
 	int leftMargin() const;
 
-	/// return the font at the given pos
-	LyXFont const getFont(lyx::pos_type pos) const;
-
 	/// return the label font for this row
 	LyXFont const getLabelFont() const;
 
-	/// return pixel width for the given pos
-	int singleWidth(lyx::pos_type pos) const;
-	int singleWidth(lyx::pos_type pos, char c) const;
-
 	/// bufferview to paint on
 	BufferView const & bv_;
 
@@ -96,17 +103,21 @@ private:
 
 	/// LyXText for the row
 	LyXText const & text_;
+	ParagraphList const & pars_;
 
 	/// The row to paint
-	RowList::iterator const rit_;
-	Row & row_;
+	Row const & row_;
 
 	/// Row's paragraph
-	mutable ParagraphList::iterator  pit_;
+	pit_type const pit_;
+	Paragraph const & par_;
+
+	/// is row erased? (change tracking)
+	bool erased_;
 
 	// Looks ugly - is
-	double xo_;
-	int yo_;
+	double const xo_;
+	int const yo_;    // current baseline
 	double x_;
 	int width_;
 	double separator_;
@@ -115,69 +126,31 @@ private:
 };
 
 
-RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
-     ParagraphList::iterator pit, RowList::iterator rit,
-     int xo, int yo)
-	: bv_(bv), pain_(bv_.painter()), text_(text), rit_(rit), row_(*rit),
-	  pit_(pit), xo_(xo), yo_(yo), x_(row_.x()),
-		width_(text_.textWidth()),
-		separator_(row_.fill_separator()),
-		hfill_(row_.fill_hfill()),
-		label_hfill_(row_.fill_label_hfill())
+RowPainter::RowPainter(PainterInfo & pi,
+	LyXText const & text, pit_type pit, Row const & row, int x, int y)
+	: bv_(*pi.base.bv), pain_(pi.pain), text_(text), pars_(text.paragraphs()),
+	  row_(row), pit_(pit), par_(text.paragraphs()[pit]),
+	  erased_(pi.erased_),
+	  xo_(x), yo_(y), width_(text_.width())
 {
-	x_ += xo_;
-
-	// background has already been cleared.
-	if (&text_ == bv_.text())
-		paintBackground();
-
-	// paint the selection background
-	if (bv_.selection().set() && &text_ == bv_.fullCursor().innerText())
-		paintSelection();
-
-	// vertical lines for appendix
-	paintAppendix();
-
-	// environment depth brackets
-	paintDepthBar();
-
-	// changebar
-	paintChangeBar();
+	RowMetrics m = text_.computeRowMetrics(pit, row_);
+	x_ = m.x + xo_;
 
-	if (row_.pos() == 0)
-		paintFirst();
+	//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
+	//row_.dump();
 
-	if (row_.endpos() >= pit_->size())
-		paintLast();
+	separator_ = m.separator;
+	hfill_ = m.hfill;
+	label_hfill_ = m.label_hfill;
 
-	// paint text
-	paintText();
-}
-
-
-/// "temporary"
-LyXFont const RowPainter::getFont(pos_type pos) const
-{
-	return text_.getFont(pit_, pos);
-}
-
-
-int RowPainter::singleWidth(lyx::pos_type pos) const
-{
-	return text_.singleWidth(pit_, pos);
-}
-
-
-int RowPainter::singleWidth(lyx::pos_type pos, char c) const
-{
-	LyXFont const & font = text_.getFont(pit_, pos);
-	return text_.singleWidth(pit_, pos, c, font);
+	BOOST_ASSERT(pit >= 0);
+	BOOST_ASSERT(pit < int(text.paragraphs().size()));
 }
 
 
 LyXFont const RowPainter::getLabelFont() const
 {
-	return text_.getLabelFont(pit_);
+	return text_.getLabelFont(par_);
 }
 
 
@@ -187,39 +160,54 @@ int RowPainter::leftMargin() const
 }
 
 
-void RowPainter::paintInset(pos_type const pos)
+void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
 {
-	InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
-
+	InsetBase const * inset = par_.getInset(pos);
 	BOOST_ASSERT(inset);
-
-	PainterInfo pi(const_cast<BufferView *>(&bv_));
-	pi.base.font = getFont(pos);
-	inset->draw(pi, int(x_), yo_ + row_.baseline());
+	PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
+	// FIXME: We should always use font, see documentation of
+	// noFontChange() in insetbase.h.
+	pi.base.font = inset->noFontChange() ?
+		bv_.buffer()->params().getFont() :
+		font;
+	pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
+	pi.erased_ = erased_ || isDeletedText(par_, pos);
+	theCoords.insets().add(inset, int(x_), yo_);
+	InsetText const * const in = inset->asTextInset();
+	// non-wide insets are painted completely. Recursive
+	bool tmp = refreshInside;
+	if (!in || !in->Wide()) {
+		refreshInside = true;
+		lyxerr[Debug::PAINTING] << endl << "Paint inset fully" << endl;
+	}
+	if (refreshInside)
+		inset->drawSelection(pi, int(x_), yo_);
+	inset->draw(pi, int(x_), yo_);
+	refreshInside = tmp;
 	x_ += inset->width();
 }
 
 
-void RowPainter::paintHebrewComposeChar(pos_type & vpos)
+void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
 {
 	pos_type pos = text_.bidi.vis2log(vpos);
 
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
+	char_type c = par_.getChar(pos);
 	str += c;
 	++vpos;
 
-	LyXFont const & font = getFont(pos);
 	int const width = font_metrics::width(c, font);
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
-		c = pit_->getChar(i);
-		if (!Encodings::IsComposeChar_hebrew(c)) {
-			if (IsPrintableNonspace(c)) {
-				int const width2 = singleWidth(i, c);
+		c = par_.getChar(i);
+		if (!Encodings::isComposeChar_hebrew(c)) {
+			if (isPrintableNonspace(c)) {
+				int const width2 =
+					text_.singleWidth(par_, i, c, text_.getFont(par_, i));
 				// dalet / resh
 				dx = (c == 'ø' || c == 'ã')
 					? width2 - width
@@ -230,108 +218,104 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos)
 	}
 
 	// Draw nikud
-	pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+	pain_.text(int(x_) + dx, yo_, str, font);
 }
 
 
-void RowPainter::paintArabicComposeChar(pos_type & vpos)
+void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
 {
 	pos_type pos = text_.bidi.vis2log(vpos);
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
-	c = pit_->transformChar(c, pos);
-	str +=c;
+	char_type c = par_.getChar(pos);
+	c = par_.transformChar(c, pos);
+	str += c;
 	++vpos;
 
-	LyXFont const & font = getFont(pos);
 	int const width = font_metrics::width(c, font);
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
-		c = pit_->getChar(i);
-		if (!Encodings::IsComposeChar_arabic(c)) {
-			if (IsPrintableNonspace(c)) {
-				int const width2 = singleWidth(i, c);
+		c = par_.getChar(i);
+		if (!Encodings::isComposeChar_arabic(c)) {
+			if (isPrintableNonspace(c)) {
+				int const width2 =
+					text_.singleWidth(par_, i, c, text_.getFont(par_, i));
 				dx = (width2 - width) / 2;
 			}
 			break;
 		}
 	}
 	// Draw nikud
-	pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+	pain_.text(int(x_) + dx, yo_, str, font);
 }
 
 
-void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
+void RowPainter::paintChars(pos_type & vpos, LyXFont font,
+			    bool hebrew, bool arabic)
 {
 	pos_type pos = text_.bidi.vis2log(vpos);
 	pos_type const end = row_.endpos();
-	LyXFont orig_font = getFont(pos);
+	FontSpan const font_span = par_.fontSpan(pos);
+	Change::Type const prev_change = par_.lookupChange(pos).type;
 
 	// first character
 	string str;
-	str += pit_->getChar(pos);
+	str += par_.getChar(pos);
 	if (arabic) {
 		unsigned char c = str[0];
-		str[0] = pit_->transformChar(c, pos);
+		str[0] = par_.transformChar(c, pos);
 	}
 
-	bool prev_struckout = isDeletedText(*pit_, pos);
-	bool prev_newtext = isInsertedText(*pit_, pos);
-
 	// collect as much similar chars as we can
-	for (++vpos; vpos < end && (pos = text_.bidi.vis2log(vpos)) >= 0; ++vpos) {
-		char c = pit_->getChar(pos);
-
-		if (!IsPrintableNonspace(c))
+	for (++vpos ; vpos < end ; ++vpos) {
+		pos = text_.bidi.vis2log(vpos);
+		if (pos < font_span.first || pos > font_span.last)
 			break;
 
-		if (prev_struckout != isDeletedText(*pit_, pos))
+		if (prev_change != par_.lookupChange(pos))
 			break;
 
-		if (prev_newtext != isInsertedText(*pit_, pos))
-			break;
+		char_type c = par_.getChar(pos);
 
-		if (arabic && Encodings::IsComposeChar_arabic(c))
+		if (!isPrintableNonspace(c))
 			break;
 
-		if (hebrew && Encodings::IsComposeChar_hebrew(c))
+		if (arabic && Encodings::isComposeChar_arabic(c))
 			break;
 
-		if (orig_font != getFont(pos))
+		if (hebrew && Encodings::isComposeChar_hebrew(c))
 			break;
 
 		if (arabic)
-			c = pit_->transformChar(c, pos);
+			c = par_.transformChar(c, pos);
 
 		str += c;
 	}
 
-	if (prev_struckout)
-		orig_font.setColor(LColor::strikeout);
-	else if (prev_newtext)
-		orig_font.setColor(LColor::newtext);
+	if (prev_change == Change::DELETED)
+		font.setColor(LColor::strikeout);
+	else if (prev_change == Change::INSERTED)
+		font.setColor(LColor::newtext);
 
 	// Draw text and set the new x position
-	//lyxerr << "paint row: yo_ " << yo_ << " baseline: " << row_.baseline()
-	//	<< "\n";
-	pain_.text(int(x_), yo_ + row_.baseline(), str, orig_font);
-	x_ += font_metrics::width(str, orig_font);
+	//lyxerr << "paint row: yo_ " << yo_ << "\n";
+	pain_.text(int(x_), yo_, str, font);
+	x_ += font_metrics::width(str, font);
 }
 
 
-void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
+void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
 {
 	if (!lyxrc.mark_foreign_language)
 		return;
-	if (orig_font.language() == latex_language)
+	if (font.language() == latex_language)
 		return;
-	if (orig_font.language() == bv_.buffer()->params().language)
+	if (font.language() == bv_.buffer()->params().language)
 		return;
 
-	int const y = yo_ + row_.baseline() + 1;
+	int const y = yo_ + 1 + desc;
 	pain_.line(int(orig_x), y, int(x_), y, LColor::language);
 }
 
@@ -339,223 +323,113 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
 void RowPainter::paintFromPos(pos_type & vpos)
 {
 	pos_type const pos = text_.bidi.vis2log(vpos);
-
-	LyXFont const & orig_font = getFont(pos);
+	LyXFont orig_font = text_.getFont(par_, pos);
 
 	double const orig_x = x_;
 
-	char const c = pit_->getChar(pos);
-
-	if (c == Paragraph::META_INSET) {
-		paintInset(pos);
+	if (par_.isInset(pos)) {
+		paintInset(pos, orig_font);
 		++vpos;
-		paintForeignMark(orig_x, orig_font);
+		paintForeignMark(orig_x, orig_font,
+			par_.getInset(pos)->descent());
 		return;
 	}
 
 	// usual characters, no insets
+	char_type const c = par_.getChar(pos);
 
 	// special case languages
-	bool const hebrew = (orig_font.language()->lang() == "hebrew");
-	bool const arabic =
-		orig_font.language()->lang() == "arabic" &&
+	std::string const & lang = orig_font.language()->lang();
+	bool const hebrew = lang == "hebrew";
+	bool const arabic = lang == "arabic" &&
 		(lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
 		lyxrc.font_norm_type == LyXRC::ISO_10646_1);
 
 	// draw as many chars as we can
 	if ((!hebrew && !arabic)
-		|| (hebrew && !Encodings::IsComposeChar_hebrew(c))
-		|| (arabic && !Encodings::IsComposeChar_arabic(c))) {
-		paintChars(vpos, hebrew, arabic);
+		|| (hebrew && !Encodings::isComposeChar_hebrew(c))
+		|| (arabic && !Encodings::isComposeChar_arabic(c))) {
+		paintChars(vpos, orig_font, hebrew, arabic);
 	} else if (hebrew) {
-		paintHebrewComposeChar(vpos);
+		paintHebrewComposeChar(vpos, orig_font);
 	} else if (arabic) {
-		paintArabicComposeChar(vpos);
+		paintArabicComposeChar(vpos, orig_font);
 	}
 
 	paintForeignMark(orig_x, orig_font);
 }
 
 
-void RowPainter::paintBackground()
-{
-	int const x = int(xo_);
-	int const y = yo_ < 0 ? 0 : yo_;
-	int const h = yo_ < 0 ? row_.height() + yo_ : row_.height();
-	pain_.fillRectangle(x, y, width_, h, text_.backgroundColor());
-}
-
-
-void RowPainter::paintSelection()
-{
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
-
-	// the current selection
-	int const startx = text_.cursorX(bv_.selStart());
-	int const endx = text_.cursorX(bv_.selEnd());
-	int const starty = text_.cursorY(bv_.selStart());
-	int const endy = text_.cursorY(bv_.selEnd());
-	ParagraphList::iterator startpit = text_.getPar(bv_.selStart());
-	ParagraphList::iterator endpit = text_.getPar(bv_.selEnd());
-	RowList::iterator startrow = startpit->getRow(bv_.selStart().pos());
-	RowList::iterator endrow = endpit->getRow(bv_.selEnd().pos());
-	int const h = row_.height();
-
-	int const row_y = pit_->y + row_.y_offset();
-
-	bool const sel_starts_here = startpit == pit_ && startrow == rit_;
-	bool const sel_ends_here   = endpit == pit_ && endrow == rit_;
-	bool const sel_on_one_row  = sel_starts_here && sel_ends_here;
-
-	if (text_.bidi.same_direction()) {
-		int x;
-		int w;
-		if (sel_on_one_row) {
-			if (startx < endx) {
-				x = int(xo_) + startx;
-				w = endx - startx;
-			} else {
-				x = int(xo_) + endx;
-				w = startx - endx;
-			}
-			pain_.fillRectangle(x, yo_, w, h, LColor::selection);
-		} else if (sel_starts_here) {
-			int const x = is_rtl ? int(xo_) : int(xo_ + startx);
-			int const w = is_rtl ? startx : (width_ - startx);
-			pain_.fillRectangle(x, yo_, w, h, LColor::selection);
-		} else if (sel_ends_here) {
-			int const x = is_rtl ? int(xo_ + endx) : int(xo_);
-			int const w = is_rtl ? (width_ - endx) : endx;
-			pain_.fillRectangle(x, yo_, w, h, LColor::selection);
-		} else if (row_y > starty && row_y < endy) {
-			pain_.fillRectangle(int(xo_), yo_, width_, h, LColor::selection);
-		}
-		return;
-	}
-
-	if ((startpit != pit_ && startrow != rit_ && !is_rtl)
-		|| (endpit != pit_ && endrow != rit_ && is_rtl))
-		pain_.fillRectangle(int(xo_), yo_,
-			int(x_), h, LColor::selection);
-
-	pos_type const body_pos = pit_->beginOfBody();
-	pos_type const end = row_.endpos();
-	double tmpx = x_;
-
-	for (pos_type vpos = row_.pos(); vpos < end; ++vpos)  {
-		pos_type pos = text_.bidi.vis2log(vpos);
-		double const old_tmpx = tmpx;
-		if (body_pos > 0 && pos == body_pos - 1) {
-			LyXLayout_ptr const & layout = pit_->layout();
-			LyXFont const lfont = getLabelFont();
-
-			tmpx += label_hfill_ + font_metrics::width(layout->labelsep, lfont);
-
-			if (pit_->isLineSeparator(body_pos - 1))
-				tmpx -= singleWidth(body_pos - 1);
-		}
-
-		tmpx += singleWidth(pos);
-
-		if (hfillExpansion(*pit_, row_, pos)) {
-			if (pos >= body_pos)
-				tmpx += hfill_;
-			else
-				tmpx += label_hfill_;
-		} else {
-			if (pit_->isSeparator(pos) && pos >= body_pos)
-				tmpx += separator_;
-		}
-
-		if (((startpit != pit_ && startrow != rit_)
-				|| bv_.selStart().pos() <= pos) &&
-			((endpit != pit_ && endrow != rit_)
-				|| pos < bv_.selEnd().pos())) {
-			// Here we do not use x_ as xo_ was added to x_.
-			pain_.fillRectangle(int(old_tmpx), yo_,
-				int(tmpx - old_tmpx + 1), h, LColor::selection);
-		}
-	}
-
-	if ((startpit != pit_ && startrow != rit_ && is_rtl) ||
-	    (endpit != pit_ && endrow != rit_ && !is_rtl)) {
-		pain_.fillRectangle(int(xo_ + tmpx),
-			yo_, int(width_ - tmpx), h, LColor::selection);
-	}
-}
-
-
 void RowPainter::paintChangeBar()
 {
 	pos_type const start = row_.pos();
 	pos_type const end = row_.endpos();
 
-	if (start == end || !pit_->isChanged(start, end - 1))
+	if (start == end || !par_.isChanged(start, end))
 		return;
 
 	int const height = text_.isLastRow(pit_, row_)
-		? row_.baseline()
-		: row_.height() + boost::next(rit_)->top_of_text();
+		? row_.ascent()
+		: row_.height();
 
-	pain_.fillRectangle(4, yo_, 5, height, LColor::changebar);
+	pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar);
 }
 
 
 void RowPainter::paintAppendix()
 {
-	if (!pit_->params().appendix())
+	if (!par_.params().appendix())
 		return;
 
-	// FIXME: can be just width_ ?
-	int const ww = width_;
+	int y = yo_ - row_.ascent();
 
-	int y = yo_;
-
-	if (pit_->params().startOfAppendix())
+	if (par_.params().startOfAppendix())
 		y += 2 * defaultRowHeight();
 
 	pain_.line(1, y, 1, yo_ + row_.height(), LColor::appendix);
-	pain_.line(ww - 2, y, ww - 2, yo_ + row_.height(), LColor::appendix);
+	pain_.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), LColor::appendix);
 }
 
 
 void RowPainter::paintDepthBar()
 {
-	Paragraph::depth_type const depth = pit_->getDepth();
+	Paragraph::depth_type const depth = par_.getDepth();
 
 	if (depth <= 0)
 		return;
 
 	Paragraph::depth_type prev_depth = 0;
 	if (!text_.isFirstRow(pit_, row_)) {
-		ParagraphList::iterator pit2 = pit_;
+		pit_type pit2 = pit_;
 		if (row_.pos() == 0)
 			--pit2;
-		prev_depth = pit2->getDepth();
+		prev_depth = pars_[pit2].getDepth();
 	}
 
 	Paragraph::depth_type next_depth = 0;
 	if (!text_.isLastRow(pit_, row_)) {
-		ParagraphList::iterator pit2 = pit_;
-		if (row_.endpos() >= pit2->size())
+		pit_type pit2 = pit_;
+		if (row_.endpos() >= pars_[pit2].size())
 			++pit2;
-		next_depth = pit2->getDepth();
+		next_depth = pars_[pit2].getDepth();
 	}
 
 	for (Paragraph::depth_type i = 1; i <= depth; ++i) {
-		int const w = NEST_MARGIN / 5;
-		int x = int(w * i + xo_);
-		// only consider the changebar space if we're drawing outer left
-		if (xo_ == 0)
-			x += CHANGEBAR_MARGIN;
-		int const h = yo_ + row_.height() - 1 - (i - next_depth - 1) * 3;
+		int const w = nestMargin() / 5;
+		int x = int(xo_) + w * i;
+		// only consider the changebar space if we're drawing outermost text
+		if (text_.isMainText())
+			x += changebarMargin();
+
+		int const starty = yo_ - row_.ascent();
+		int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
 
-		pain_.line(x, yo_, x, h, LColor::depthbar);
+		pain_.line(x, starty, x, starty + h, LColor::depthbar);
 
 		if (i > prev_depth)
-			pain_.fillRectangle(x, yo_, w, 2, LColor::depthbar);
+			pain_.fillRectangle(x, starty, w, 2, LColor::depthbar);
 		if (i > next_depth)
-			pain_.fillRectangle(x, h, w, 2, LColor::depthbar);
+			pain_.fillRectangle(x, starty + h, w, 2, LColor::depthbar);
 	}
 }
 
@@ -586,28 +460,27 @@ int RowPainter::paintAppendixStart(int y)
 
 void RowPainter::paintFirst()
 {
-	ParagraphParameters const & parparams = pit_->params();
+	ParagraphParameters const & parparams = par_.params();
 
 	int y_top = 0;
 
 	// start of appendix?
 	if (parparams.startOfAppendix())
-		y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
+		y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
 	Buffer const & buffer = *bv_.buffer();
 
-	LyXLayout_ptr const & layout = pit_->layout();
+	LyXLayout_ptr const & layout = par_.layout();
 
 	if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
-		if (pit_ != text_.paragraphs().begin()) {
+		if (pit_ != 0) {
 			if (layout->latextype == LATEX_PARAGRAPH
-				&& !pit_->getDepth()) {
+				&& !par_.getDepth()) {
 				y_top += buffer.params().getDefSkip().inPixels(bv_);
 			} else {
-				LyXLayout_ptr const & playout =
-					boost::prior(pit_)->layout();
+				LyXLayout_ptr const & playout = pars_[pit_ - 1].layout();
 				if (playout->latextype == LATEX_PARAGRAPH
-					&& !boost::prior(pit_)->getDepth()) {
+					&& !pars_[pit_ - 1].getDepth()) {
 					// is it right to use defskip here, too? (AS)
 					y_top += buffer.params().getDefSkip().inPixels(bv_);
 				}
@@ -615,11 +488,9 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	int const ww = bv_.workWidth();
-
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+	bool const is_rtl = text_.isRTL(par_);
 	bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
-	//lyxerr << "paintFirst: " << pit_->id() << " is_seq: " << is_seq << std::endl;
+	//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
 
 	// should we print a label?
 	if (layout->labeltype >= LABEL_STATIC
@@ -627,47 +498,43 @@ void RowPainter::paintFirst()
 		      || layout->latextype != LATEX_ENVIRONMENT
 		      || is_seq)) {
 
-		LyXFont font = getLabelFont();
-		if (!pit_->getLabelstring().empty()) {
+		LyXFont const font = getLabelFont();
+		string const str = par_.getLabelstring();
+		if (!str.empty()) {
 			double x = x_;
-			string const str = pit_->getLabelstring();
 
 			// this is special code for the chapter layout. This is
 			// printed in an extra row and has a pagebreak at
 			// the top.
 			if (layout->counter == "chapter") {
-				if (buffer.params().secnumdepth >= 0) {
-					float spacing_val = 1.0;
-					if (!parparams.spacing().isDefault()) {
-						spacing_val = parparams.spacing().getValue();
-					} else {
-						spacing_val = buffer.params().spacing().getValue();
-					}
-
-					int const maxdesc =
-						int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
-						+ int(layout->parsep) * defaultRowHeight();
-
-					if (is_rtl) {
-						x = ww - leftMargin() -
-							font_metrics::width(str, font);
-					}
-
-					pain_.text(int(x),
-						yo_ + row_.baseline() -
-						row_.ascent_of_text() - maxdesc,
-						str, font);
+				double spacing_val = 1.0;
+				if (!parparams.spacing().isDefault()) {
+					spacing_val = parparams.spacing().getValue();
+				} else {
+					spacing_val = buffer.params().spacing().getValue();
+				}
+
+				int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
+
+				int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+					+ int(layout->parsep) * defaultRowHeight();
+
+				if (is_rtl) {
+					x = width_ - leftMargin() -
+						font_metrics::width(str, font);
 				}
+
+				pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 			} else {
 				if (is_rtl) {
-					x = ww - leftMargin()
+					x = width_ - leftMargin()
 						+ font_metrics::width(layout->labelsep, font);
 				} else {
 					x = x_ - font_metrics::width(layout->labelsep, font)
 						- font_metrics::width(str, font);
 				}
 
-				pain_.text(int(x), yo_ + row_.baseline(), str, font);
+				pain_.text(int(x), yo_, str, font);
 			}
 		}
 
@@ -678,14 +545,15 @@ void RowPainter::paintFirst()
 		layout->labeltype == LABEL_BIBLIO ||
 		layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
 		LyXFont font = getLabelFont();
-		if (!pit_->getLabelstring().empty()) {
-			string const str = pit_->getLabelstring();
-			float spacing_val = 1.0;
-			if (!parparams.spacing().isDefault()) {
+		if (!par_.getLabelstring().empty()) {
+			string const str = par_.getLabelstring();
+			double spacing_val = 1.0;
+			if (!parparams.spacing().isDefault())
 				spacing_val = parparams.spacing().getValue();
-			} else {
+			else
 				spacing_val = buffer.params().spacing().getValue();
-			}
+
+			int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
 
 			int maxdesc =
 				int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
@@ -693,16 +561,15 @@ void RowPainter::paintFirst()
 
 			double x = x_;
 			if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
-				x = ((is_rtl ? leftMargin() : x_)
-					 + ww - text_.rightMargin(*pit_)) / 2;
+				if (is_rtl)
+					x = leftMargin();
+				x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
 				x -= font_metrics::width(str, font) / 2;
 			} else if (is_rtl) {
-				x = ww - leftMargin() -
+				x = width_ - leftMargin() -
 					font_metrics::width(str, font);
 			}
-			pain_.text(int(x),
-			    yo_ + row_.baseline() - row_.ascent_of_text() - maxdesc,
-				  str, font);
+			pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 		}
 	}
 }
@@ -710,8 +577,7 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-	int const ww = bv_.workWidth();
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+	bool const is_rtl = text_.isRTL(par_);
 	int const endlabel = getEndLabel(pit_, text_.paragraphs());
 
 	// draw an endlabel
@@ -720,11 +586,11 @@ void RowPainter::paintLast()
 	case END_LABEL_FILLED_BOX: {
 		LyXFont const font = getLabelFont();
 		int const size = int(0.75 * font_metrics::maxAscent(font));
-		int const y = yo_ + row_.baseline() - size;
-		int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: ww - size;
+		int const y = yo_ - size;
+		int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
 
-		if (row_.fill() <= size)
-			x += (size - row_.fill() + 1) * (is_rtl ? -1 : 1);
+		if (width_ - int(row_.width()) <= size)
+			x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
 
 		if (endlabel == END_LABEL_BOX)
 			pain_.rectangle(x, y, size, size, LColor::eolmarker);
@@ -735,11 +601,11 @@ void RowPainter::paintLast()
 
 	case END_LABEL_STATIC: {
 		LyXFont font = getLabelFont();
-		string const & str = pit_->layout()->endlabelstring();
+		string const & str = par_.layout()->endlabelstring();
 		double const x = is_rtl ?
 			x_ - font_metrics::width(str, font)
-			: ww - text_.rightMargin(*pit_) - row_.fill();
-		pain_.text(int(x), yo_ + row_.baseline(), str, font);
+			: - text_.rightMargin(par_) - row_.width();
+		pain_.text(int(x), yo_, str, font);
 		break;
 	}
 
@@ -752,49 +618,65 @@ void RowPainter::paintLast()
 void RowPainter::paintText()
 {
 	pos_type const end = row_.endpos();
-	pos_type body_pos = pit_->beginOfBody();
+	pos_type body_pos = par_.beginOfBody();
 	if (body_pos > 0 &&
-		(body_pos > end || !pit_->isLineSeparator(body_pos - 1))) {
+		(body_pos > end || !par_.isLineSeparator(body_pos - 1))) {
 		body_pos = 0;
 	}
 
-	LyXLayout_ptr const & layout = pit_->layout();
+	LyXLayout_ptr const & layout = par_.layout();
 
 	bool running_strikeout = false;
 	bool is_struckout = false;
 	int last_strikeout_x = 0;
 
+	// Use font span to speed things up, see below
+	FontSpan font_span;
+	LyXFont font;
+
 	for (pos_type vpos = row_.pos(); vpos < end; ) {
 		if (x_ > bv_.workWidth())
 			break;
 
-		pos_type pos = text_.bidi.vis2log(vpos);
+		pos_type const pos = text_.bidi.vis2log(vpos);
 
-		if (pos >= pit_->size()) {
+		if (pos >= par_.size()) {
 			++vpos;
 			continue;
 		}
 
-		if (x_ + singleWidth(pos) < 0) {
-			x_ += singleWidth(pos);
+		// Use font span to speed things up, see above
+		if (vpos < font_span.first || vpos > font_span.last) {
+			font_span = par_.fontSpan(vpos);
+			font = text_.getFont(par_, vpos);
+		}
+
+		const int width_pos =
+			text_.singleWidth(par_, pos, par_.getChar(pos), font);
+
+		if (x_ + width_pos < 0) {
+			x_ += width_pos;
 			++vpos;
 			continue;
 		}
 
-		is_struckout = isDeletedText(*pit_, pos);
+		is_struckout = isDeletedText(par_, pos);
 
 		if (is_struckout && !running_strikeout) {
 			running_strikeout = true;
 			last_strikeout_x = int(x_);
 		}
 
-		bool const highly_editable_inset = pit_->isInset(pos)
-			&& isHighlyEditableInset(pit_->getInset(pos));
+		bool const highly_editable_inset = par_.isInset(pos)
+			&& isHighlyEditableInset(par_.getInset(pos));
 
-		// if we reach the end of a struck out range, paint it
-		// we also don't paint across things like tables
+		// If we reach the end of a struck out range, paint it.
+		// We also don't paint across things like tables
 		if (running_strikeout && (highly_editable_inset || !is_struckout)) {
-			int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
+			// Calculate 1/3 height of the buffer's default font
+			int const middle =
+				yo_ -
+				font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
 			pain_.line(last_strikeout_x, middle, int(x_), middle,
 				LColor::strikeout, Painter::line_solid, Painter::line_thin);
 			running_strikeout = false;
@@ -804,18 +686,18 @@ void RowPainter::paintText()
 			int const lwidth = font_metrics::width(layout->labelsep,
 				getLabelFont());
 
-			x_ += label_hfill_ + lwidth - singleWidth(body_pos - 1);
+			x_ += label_hfill_ + lwidth - width_pos;
 		}
 
-		if (pit_->isHfill(pos)) {
+		if (par_.isHfill(pos)) {
 			x_ += 1;
 
-			int const y0 = yo_ + row_.baseline();
+			int const y0 = yo_;
 			int const y1 = y0 - defaultRowHeight() / 2;
 
 			pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
 
-			if (hfillExpansion(*pit_, row_, pos)) {
+			if (hfillExpansion(par_, row_, pos)) {
 				int const y2 = (y0 + y1) / 2;
 
 				if (pos >= body_pos) {
@@ -833,8 +715,8 @@ void RowPainter::paintText()
 			}
 			x_ += 2;
 			++vpos;
-		} else if (pit_->isSeparator(pos)) {
-			x_ += singleWidth(pos);
+		} else if (par_.isSeparator(pos)) {
+			x_ += width_pos;
 			if (pos >= body_pos)
 				x_ += separator_;
 			++vpos;
@@ -845,7 +727,10 @@ void RowPainter::paintText()
 
 	// if we reach the end of a struck out range, paint it
 	if (running_strikeout) {
-		int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
+		// calculate 1/3 height of the buffer's default font
+		int const middle =
+			yo_ -
+			font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
 		pain_.line(last_strikeout_x, middle, int(x_), middle,
 			LColor::strikeout, Painter::line_solid, Painter::line_thin);
 		running_strikeout = false;
@@ -853,42 +738,214 @@ void RowPainter::paintText()
 }
 
 
-int paintPars(BufferView const & bv, LyXText const & text,
-	ParagraphList::iterator pit, int xo, int yo, int y)
+lyx::size_type calculateRowSignature(Row const & row, Paragraph const & par,
+	int x, int y)
+{
+	boost::crc_32_type crc;
+	for (lyx::pos_type i = row.pos(); i < row.endpos(); ++i) {
+		const unsigned char b[] = { par.getChar(i) };
+		crc.process_bytes(b, 1);
+	}
+	const unsigned char b[] = { x, y, row.width() };
+	crc.process_bytes(b, 3);
+	return crc.checksum();
+}
+
+
+bool CursorOnRow(PainterInfo & pi, pit_type const pit,
+	RowList::const_iterator rit, LyXText const & text)
 {
-	//lyxerr << "  paintRows: pit: " << &*pit << endl;
-	int const y2 = bv.painter().paperHeight();
-	y -= bv.top_y();
+	// Is there a cursor on this row (or inside inset on row)
+	LCursor & cur = pi.base.bv->cursor();
+	for (lyx::size_type d = 0; d < cur.depth(); d++) {
+		CursorSlice const & sl = cur[d];
+		if (sl.text() == &text
+		    && sl.pit() == pit
+		    && sl.pos() >= rit->pos()
+		    && sl.pos() <= rit->endpos())
+			return true;
+	}
+	return false;
+}
 
-	ParagraphList::iterator end = text.paragraphs().end();
 
-	for ( ; pit != end; ++pit) {
-		RowList::iterator row = pit->rows.begin();
-		RowList::iterator rend = pit->rows.end();
+bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
+	RowList::const_iterator rit, LyXText const & text)
+{
+	// Is there a cursor inside an inset on this row, and is this inset
+	// the only "character" on this row
+	LCursor & cur = pi.base.bv->cursor();
+	if (rit->pos() + 1 != rit->endpos())
+		return false;
+	for (lyx::size_type d = 0; d < cur.depth(); d++) {
+		CursorSlice const & sl = cur[d];
+		if (sl.text() == &text
+		    && sl.pit() == pit
+		    && sl.pos() == rit->pos())
+			return d < cur.depth() - 1;
+	}
+	return false;
+}
 
-		for ( ; row != rend; ++row) {
-			RowPainter(bv, text, pit, row, xo, y + yo);
-			y += row->height();
+
+void paintPar
+	(PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y,
+	 bool repaintAll)
+{
+//	lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
+	static NullPainter nop;
+	static PainterInfo nullpi(pi.base.bv, nop);
+	int const ww = pi.base.bv->workHeight();
+
+	Paragraph const & par = text.paragraphs()[pit];
+
+	RowList::const_iterator const rb = par.rows().begin();
+	RowList::const_iterator const re = par.rows().end();
+	theCoords.parPos()[&text][pit] = Point(x, y);
+
+	y -= rb->ascent();
+	lyx::size_type rowno(0);
+	for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
+		y += rit->ascent();
+		// Allow setting of refreshInside for nested insets in
+		// this row only
+		bool tmp = refreshInside;
+
+		// Row signature; has row changed since last paint?
+		lyx::size_type const row_sig = calculateRowSignature(*rit, par, x, y);
+		bool row_has_changed = par.rowSignature()[rowno] != row_sig;
+
+		bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
+		bool in_inset_alone_on_row = innerCursorOnRow(pi, pit, rit,
+			text);
+
+		// If this is the only object on the row, we can make it wide
+		for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
+			InsetBase const * const in = par.getInset(i);
+			if (in) {
+				InsetText const * const t = in->asTextInset();
+				if (t)
+					t->Wide() = in_inset_alone_on_row;
+			}
 		}
-		if (yo + y >= y2)
-			break;
-	}
 
-	return y;
+		// If selection is on, the current row signature differs
+		// from cache, or cursor is inside an inset _on this row_,
+		// then paint the row
+		if (repaintAll || row_has_changed || cursor_on_row) {
+			// Add to row signature cache
+			par.rowSignature()[rowno] = row_sig;
+
+			bool const inside = (y + rit->descent() >= 0
+				       && y - rit->ascent() < ww);
+			RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
+			// Clear background of this row
+			// (if paragraph background was not cleared)
+			if (!repaintAll &&
+			    (!in_inset_alone_on_row || row_has_changed)) {
+				pi.pain.fillRectangle(x, y - rit->ascent(),
+				    text.maxwidth_, rit->height(),
+				    text.backgroundColor());
+				// If outer row has changed, force nested
+				// insets to repaint completely
+				if (row_has_changed)
+					refreshInside = true;
+			}
+
+			// Instrumentation for testing row cache (see also
+			// 12 lines lower):
+			if (text.isMainText())
+				lyxerr[Debug::PAINTING] << "#";
+			else
+				lyxerr[Debug::PAINTING] << "[" <<
+				    repaintAll << row_has_changed <<
+				    cursor_on_row << "]";
+			rp.paintAppendix();
+			rp.paintDepthBar();
+			rp.paintChangeBar();
+			if (rit == rb)
+				rp.paintFirst();
+			if (rit + 1 == re)
+				rp.paintLast();
+			rp.paintText();
+		}
+		y += rit->descent();
+		// Restore, see above
+		refreshInside = tmp;
+	}
+	lyxerr[Debug::PAINTING] << "." << endl;
 }
 
 } // namespace anon
 
 
-int paintText(BufferView const & bv)
+void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
 {
-	ParagraphList::iterator pit;
-	bv.text()->getRowNearY(bv.top_y(), pit);
-	return paintPars(bv, *bv.text(), pit, 0, 0, pit->y);
+	Painter & pain = bv.owner()->workArea()->getPainter();
+	LyXText * const text = bv.text();
+	bool const select = bv.cursor().selection();
+
+	PainterInfo pi(const_cast<BufferView *>(&bv), pain);
+	// Should the whole screen, including insets, be refreshed?
+	bool repaintAll = select || !vi.singlepar;
+
+	if (repaintAll) {
+		// Clear background (if not delegated to rows)
+		pain.fillRectangle(0, vi.y1, bv.workWidth(), vi.y2 - vi.y1,
+			text->backgroundColor());
+	}
+	if (select) {
+		text->drawSelection(pi, 0, 0);
+	}
+
+	int yy = vi.y1;
+	// draw contents
+	for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
+		refreshInside = repaintAll;
+		Paragraph const & par = text->getPar(pit);
+		yy += par.ascent();
+		paintPar(pi, *bv.text(), pit, 0, yy, repaintAll);
+		yy += par.descent();
+	}
+
+	// Cache one paragraph above and one below
+	// Note MV: this cannot be suppressed even for singlepar.
+	// Try viewing the User Guide Mobius figure
+
+	if (vi.p1 > 0) {
+		text->redoParagraph(vi.p1 - 1);
+		theCoords.parPos()[bv.text()][vi.p1 - 1] =
+			Point(0, vi.y1 - text->getPar(vi.p1 - 1).descent());
+	}
+
+	if (vi.p2 < lyx::pit_type(text->paragraphs().size()) - 1) {
+		text->redoParagraph(vi.p2 + 1);
+		theCoords.parPos()[bv.text()][vi.p2 + 1] =
+			Point(0, vi.y2 + text->getPar(vi.p2 + 1).ascent());
+	}
+
+	// and grey out above (should not happen later)
+//	lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
+	if (vi.y1 > 0 && !vi.singlepar)
+		pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea);
+
+	// and possibly grey out below
+//	lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
+	if (vi.y2 < bv.workHeight() && !vi.singlepar)
+		pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
 }
 
 
-void paintTextInset(LyXText const & text, PainterInfo & pi, int xo, int yo)
+void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
 {
-	paintPars(*pi.base.bv, text, text.paragraphs().begin(), xo, yo, 0);
+//	lyxerr << "  paintTextInset: y: " << y << endl;
+
+	y -= text.getPar(0).ascent();
+	// This flag can not be set from within same inset:
+	bool repaintAll = refreshInside;
+	for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
+		y += text.getPar(pit).ascent();
+		paintPar(pi, text, pit, x, y, repaintAll);
+		y += text.getPar(pit).descent();
+	}
 }