X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.C;h=3b703b58d49080700bb0b2ae5608b4e11e93481a;hb=c688967bc365872241697371e7bd12e2b5217028;hp=1c63af6d4b1528a596b2d189831601cba3dea806;hpb=6ff15cc813aa4575144e1287747b5468f56c84aa;p=lyx.git

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 1c63af6d4b..3b703b58d4 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -32,43 +32,34 @@
 #include "vspace.h"
 
 #include "frontends/font_metrics.h"
+#include "frontends/nullpainter.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
 
 #include "support/textutils.h"
 
-
 using lyx::pos_type;
+using lyx::par_type;
+
+using std::endl;
 using std::max;
 using std::string;
 
-extern int PAPER_MARGIN;
+extern int NEST_MARGIN;
 extern int CHANGEBAR_MARGIN;
-extern int LEFT_MARGIN;
 
-namespace {
 
-// "temporary". We'll never get to use more
-// references until we start adding hacks like
-// these until other places catch up.
-BufferView * perv(BufferView const & bv)
-{
-	return const_cast<BufferView *>(&bv);
-}
+namespace {
 
 /**
  * A class used for painting an individual row of text.
  */
 class RowPainter {
 public:
-	/// initialise painter
-	RowPainter(BufferView const & bv, LyXText const & text,
-		ParagraphList::iterator pit,
-		RowList::iterator rit, int y_offset, int x_offset, int y);
-
-	/// do the painting
-	void paint();
+	/// initialise and run painter
+	RowPainter(BufferView const & bv, Painter & pain, LyXText const & text,
+		par_type pit, RowList::iterator rit, int y);
 private:
 	// paint various parts
 	void paintBackground();
@@ -83,7 +74,6 @@ private:
 	void paintArabicComposeChar(lyx::pos_type & vpos);
 	void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
 	int paintAppendixStart(int y);
-	int paintLengthMarker(string const & prefix, VSpace const & vsp, int start);
 	void paintText();
 	void paintFromPos(lyx::pos_type & vpos);
 	void paintInset(lyx::pos_type const pos);
@@ -109,19 +99,19 @@ private:
 
 	/// LyXText for the row
 	LyXText const & text_;
+	ParagraphList & pars_;
 
 	/// The row to paint
 	RowList::iterator const rit_;
 	Row & row_;
 
 	/// Row's paragraph
-	mutable ParagraphList::iterator  pit_;
+	mutable par_type pit_;
 
 	// Looks ugly - is
 	double xo_;
 	int yo_;
 	double x_;
-	int y_;
 	int width_;
 	double separator_;
 	double hfill_;
@@ -129,17 +119,47 @@ private:
 };
 
 
-RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
-     ParagraphList::iterator pit, RowList::iterator rit,
-     int y_offset, int x_offset, int y)
-	: bv_(bv), pain_(bv_.painter()), text_(text), rit_(rit), row_(*rit),
-	  pit_(pit), xo_(x_offset), yo_(y_offset),
-		x_(row_.x()), y_(y),
-		width_(text_.workWidth()),
-		separator_(row_.fill_separator()),
-		hfill_(row_.fill_hfill()),
-		label_hfill_(row_.fill_label_hfill())
-{}
+RowPainter::RowPainter(BufferView const & bv, Painter & pain,
+	LyXText const & text, par_type pit, RowList::iterator rit, int y)
+	: bv_(bv), pain_(pain), text_(text), pars_(text.paragraphs()),
+	  rit_(rit), row_(*rit), pit_(pit),
+	  xo_(text_.xo_), yo_(y), width_(text_.width())
+{
+	//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo << " yo: " << yo
+	//	<< " pit->y: " << pit_->y
+	//	<< " row: " << (pars_[pit_].size() ? pars_[pit_].getChar(row_.pos()) : 'X') << endl;
+	RowMetrics m = text_.computeRowMetrics(pit, row_);
+	x_ = m.x + xo_;
+	separator_ = m.separator;
+	hfill_ = m.hfill;
+	label_hfill_ = m.label_hfill;
+
+	// background has already been cleared.
+	if (&text_ == bv_.text())
+		paintBackground();
+
+	// paint the selection background
+	if (bv_.cursor().selection() && &text_ == bv_.cursor().text())
+		paintSelection();
+
+	// vertical lines for appendix
+	paintAppendix();
+
+	// environment depth brackets
+	paintDepthBar();
+
+	// changebar
+	paintChangeBar();
+
+	if (row_.pos() == 0)
+		paintFirst();
+
+	if (row_.endpos() >= pars_[pit_].size())
+		paintLast();
+
+	// paint text
+	paintText();
+}
 
 
 /// "temporary"
@@ -170,18 +190,17 @@ LyXFont const RowPainter::getLabelFont() const
 
 int RowPainter::leftMargin() const
 {
-	return text_.leftMargin(pit_, row_);
+	return text_.leftMargin(pit_, row_.pos());
 }
 
 
 void RowPainter::paintInset(pos_type const pos)
 {
-	InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
-
+	InsetBase const * inset = pars_[pit_].getInset(pos);
 	BOOST_ASSERT(inset);
-
-	PainterInfo pi(perv(bv_));
+	PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
 	pi.base.font = getFont(pos);
+	inset->drawSelection(pi, int(x_), yo_ + row_.baseline());
 	inset->draw(pi, int(x_), yo_ + row_.baseline());
 	x_ += inset->width();
 }
@@ -194,7 +213,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos)
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
+	char c = pars_[pit_].getChar(pos);
 	str += c;
 	++vpos;
 
@@ -203,7 +222,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos)
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
-		c = pit_->getChar(i);
+		c = pars_[pit_].getChar(i);
 		if (!Encodings::IsComposeChar_hebrew(c)) {
 			if (IsPrintableNonspace(c)) {
 				int const width2 = singleWidth(i, c);
@@ -227,9 +246,9 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos)
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
-	c = pit_->transformChar(c, pos);
-	str +=c;
+	char c = pars_[pit_].getChar(pos);
+	c = pars_[pit_].transformChar(c, pos);
+	str += c;
 	++vpos;
 
 	LyXFont const & font = getFont(pos);
@@ -237,7 +256,7 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos)
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
-		c = pit_->getChar(i);
+		c = pars_[pit_].getChar(i);
 		if (!Encodings::IsComposeChar_arabic(c)) {
 			if (IsPrintableNonspace(c)) {
 				int const width2 = singleWidth(i, c);
@@ -259,26 +278,26 @@ void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
 
 	// first character
 	string str;
-	str += pit_->getChar(pos);
+	str += pars_[pit_].getChar(pos);
 	if (arabic) {
 		unsigned char c = str[0];
-		str[0] = pit_->transformChar(c, pos);
+		str[0] = pars_[pit_].transformChar(c, pos);
 	}
 
-	bool prev_struckout = isDeletedText(*pit_, pos);
-	bool prev_newtext = isInsertedText(*pit_, pos);
+	bool prev_struckout = isDeletedText(pars_[pit_], pos);
+	bool prev_newtext = isInsertedText(pars_[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);
+		char c = pars_[pit_].getChar(pos);
 
 		if (!IsPrintableNonspace(c))
 			break;
 
-		if (prev_struckout != isDeletedText(*pit_, pos))
+		if (prev_struckout != isDeletedText(pars_[pit_], pos))
 			break;
 
-		if (prev_newtext != isInsertedText(*pit_, pos))
+		if (prev_newtext != isInsertedText(pars_[pit_], pos))
 			break;
 
 		if (arabic && Encodings::IsComposeChar_arabic(c))
@@ -291,7 +310,7 @@ void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
 			break;
 
 		if (arabic)
-			c = pit_->transformChar(c, pos);
+			c = pars_[pit_].transformChar(c, pos);
 
 		str += c;
 	}
@@ -331,7 +350,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
 	double const orig_x = x_;
 
-	char const c = pit_->getChar(pos);
+	char const c = pars_[pit_].getChar(pos);
 
 	if (c == Paragraph::META_INSET) {
 		paintInset(pos);
@@ -375,62 +394,53 @@ void RowPainter::paintBackground()
 
 void RowPainter::paintSelection()
 {
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+	bool const is_rtl = text_.isRTL(pars_[pit_]);
 
 	// the current selection
-	int const startx = text_.selection.start.x();
-	int const endx = text_.selection.end.x();
-	int const starty = text_.selection.start.y();
-	int const endy = text_.selection.end.y();
-	ParagraphList::iterator startpit = text_.getPar(text_.selection.start);
-	ParagraphList::iterator endpit = text_.getPar(text_.selection.end);
-	RowList::iterator startrow = startpit->getRow(text_.selection.start.pos());
-	RowList::iterator endrow = endpit->getRow(text_.selection.end.pos());
+	LCursor const & cur = bv_.cursor();
+	int const starty = text_.cursorY(cur.selBegin());
+	int const endy = text_.cursorY(cur.selEnd());
+	par_type startpit = cur.selBegin().par();
+	par_type endpit = cur.selEnd().par();
+	RowList::iterator startrow = pars_[startpit].getRow(cur.selBegin().pos());
+	RowList::iterator endrow = pars_[endpit].getRow(cur.selEnd().pos());
 	int const h = row_.height();
 
-	int const row_y = pit_->y + row_.y_offset();
-	
+	int const row_y = text_.yo_ + pars_[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 y = yo_;
-		int w;
-		if (startrow == rit_ && endrow == rit_) {
-			if (startx < endx) {
-				x = int(xo_) + startx;
-				w = endx - startx;
-			} else {
-				x = int(xo_) + endx;
-				w = startx - endx;
-			}
-			pain_.fillRectangle(x, y, w, h, LColor::selection);
-		} else if (startrow == rit_) {
-			int const x = is_rtl ? int(xo_) : int(xo_ + startx);
-			int const w = is_rtl ? startx : (width_ - startx);
-			pain_.fillRectangle(x, y, w, h, LColor::selection);
-		} else if (endrow == rit_) {
-			int const x = is_rtl ? int(xo_ + endx) : int(xo_);
-			int const w = is_rtl ? (width_ - endx) : endx;
-			pain_.fillRectangle(x, y, w, h, LColor::selection);
+		if (sel_on_one_row) {
+			int const startx = text_.cursorX(cur.selBegin());
+			int const endx = text_.cursorX(cur.selEnd());
+			int const x1 = is_rtl ? endx : startx;
+			int const x2 = is_rtl ? startx : endx;
+			pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
+		} else if (sel_starts_here) {
+			int const startx = text_.cursorX(cur.selBegin());
+			int const x1 = is_rtl ? int(xo_) : startx;
+			int const x2 = is_rtl ? startx : int(xo_) + width_;
+			pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
+		} else if (sel_ends_here) {
+			int const endx = text_.cursorX(cur.selEnd());
+			int const x1 = is_rtl ? endx : int(xo_);
+			int const x2 = is_rtl ? int(xo_) + width_ : endx;
+			pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
 		} else if (row_y > starty && row_y < endy) {
-		
-			pain_.fillRectangle(int(xo_), y, width_, h, LColor::selection);
-		}
-		return;
-	}
-
-	if (startrow != rit_ && endrow != rit_) {
-		if (y_ > starty && y_ < endy) {
-			int w = width_;
-			pain_.fillRectangle(int(xo_), yo_, w, h, LColor::selection);
+			pain_.fillRectangle(int(xo_), yo_, width_, h, LColor::selection);
 		}
 		return;
 	}
 
-	if ((startrow != rit_ && !is_rtl) || (endrow != rit_ && is_rtl))
+	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 body_pos = pars_[pit_].beginOfBody();
 	pos_type const end = row_.endpos();
 	double tmpx = x_;
 
@@ -438,38 +448,41 @@ void RowPainter::paintSelection()
 		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();
+			LyXLayout_ptr const & layout = pars_[pit_].layout();
 			LyXFont const lfont = getLabelFont();
 
 			tmpx += label_hfill_ + font_metrics::width(layout->labelsep, lfont);
 
-			if (pit_->isLineSeparator(body_pos - 1))
+			if (pars_[pit_].isLineSeparator(body_pos - 1))
 				tmpx -= singleWidth(body_pos - 1);
 		}
 
 		tmpx += singleWidth(pos);
 
-		if (hfillExpansion(*pit_, row_, pos)) {
+		if (hfillExpansion(pars_[pit_], row_, pos)) {
 			if (pos >= body_pos)
 				tmpx += hfill_;
 			else
 				tmpx += label_hfill_;
 		} else {
-			if (pit_->isSeparator(pos) && pos >= body_pos)
+			if (pars_[pit_].isSeparator(pos) && pos >= body_pos)
 				tmpx += separator_;
 		}
 
-		if ((startrow != rit_ || text_.selection.start.pos() <= pos) &&
-			(endrow != rit_ || pos < text_.selection.end.pos())) {
+		if (((startpit != pit_ && startrow != rit_)
+				|| cur.selBegin().pos() <= pos) &&
+			((endpit != pit_ && endrow != rit_)
+				|| pos < cur.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 ((startrow != rit_ && is_rtl) || (endrow != rit_ && !is_rtl)) {
+	if ((startpit != pit_ && startrow != rit_ && is_rtl) ||
+	    (endpit != pit_ && endrow != rit_ && !is_rtl)) {
 		pain_.fillRectangle(int(xo_ + tmpx),
-			yo_, int(bv_.workWidth() - tmpx), h, LColor::selection);
+			yo_, int(width_ - tmpx), h, LColor::selection);
 	}
 }
 
@@ -479,7 +492,7 @@ 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 || !pars_[pit_].isChanged(start, end - 1))
 		return;
 
 	int const height = text_.isLastRow(pit_, row_)
@@ -492,47 +505,44 @@ void RowPainter::paintChangeBar()
 
 void RowPainter::paintAppendix()
 {
-	if (!pit_->params().appendix())
+	if (!pars_[pit_].params().appendix())
 		return;
 
-	// FIXME: can be just width_ ?
-	int const ww = bv_.workWidth();
-
 	int y = yo_;
 
-	if (pit_->params().startOfAppendix())
+	if (pars_[pit_].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 = pars_[pit_].getDepth();
 
 	if (depth <= 0)
 		return;
 
 	Paragraph::depth_type prev_depth = 0;
 	if (!text_.isFirstRow(pit_, row_)) {
-		ParagraphList::iterator pit2 = pit_;
+		par_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())
+		par_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 = PAPER_MARGIN / 5;
+		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)
@@ -549,73 +559,6 @@ void RowPainter::paintDepthBar()
 }
 
 
-int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp,
-	int start)
-{
-	if (vsp.kind() == VSpace::NONE)
-		return 0;
-
-	int const arrow_size = 4;
-	int const size = getLengthMarkerHeight(bv_, vsp);
-	int const end = start + size;
-
-	// the label to display (if any)
-	string str;
-	// y-values for top arrow
-	int ty1, ty2;
-	// y-values for bottom arrow
-	int by1, by2;
-
-	str = prefix + " (" + vsp.asLyXCommand() + ")";
-
-	if (vsp.kind() == VSpace::VFILL) {
-		ty1 = ty2 = start;
-		by1 = by2 = end;
-	} else {
-		// adding or removing space
-		bool const added = vsp.kind() != VSpace::LENGTH ||
-				   vsp.length().len().value() > 0.0;
-		ty1 = added ? (start + arrow_size) : start;
-		ty2 = added ? start : (start + arrow_size);
-		by1 = added ? (end - arrow_size) : end;
-		by2 = added ? end : (end - arrow_size);
-	}
-
-	int const leftx = int(xo_) + leftMargin();
-	int const midx = leftx + arrow_size;
-	int const rightx = midx + arrow_size;
-
-	// first the string
-	int w = 0;
-	int a = 0;
-	int d = 0;
-
-	LyXFont font;
-	font.setColor(LColor::added_space);
-	font.decSize();
-	font.decSize();
-	font_metrics::rectText(str, font, w, a, d);
-
-	pain_.rectText(leftx + 2 * arrow_size + 5,
-		       start + ((end - start) / 2) + d,
-		       str, font,
-		       LColor::none, LColor::none);
-
-	// top arrow
-	pain_.line(leftx, ty1, midx, ty2, LColor::added_space);
-	pain_.line(midx, ty2, rightx, ty1, LColor::added_space);
-
-	// bottom arrow
-	pain_.line(leftx, by1, midx, by2, LColor::added_space);
-	pain_.line(midx, by2, rightx, by1, LColor::added_space);
-
-	// joining line
-	pain_.line(midx, ty2, midx, by2, LColor::added_space);
-
-	return size;
-}
-
-
 int RowPainter::paintAppendixStart(int y)
 {
 	LyXFont pb_font;
@@ -642,7 +585,7 @@ int RowPainter::paintAppendixStart(int y)
 
 void RowPainter::paintFirst()
 {
-	ParagraphParameters const & parparams = pit_->params();
+	ParagraphParameters const & parparams = pars_[pit_].params();
 
 	int y_top = 0;
 
@@ -650,28 +593,19 @@ void RowPainter::paintFirst()
 	if (parparams.startOfAppendix())
 		y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
 
-	// the top margin
-	if (text_.isFirstRow(pit_, row_) && !text_.isInInset())
-		y_top += PAPER_MARGIN;
-
-	// draw the additional space if needed:
-	y_top += paintLengthMarker(_("Space above"), parparams.spaceTop(),
-			yo_ + y_top);
-
 	Buffer const & buffer = *bv_.buffer();
 
-	LyXLayout_ptr const & layout = pit_->layout();
+	LyXLayout_ptr const & layout = pars_[pit_].layout();
 
 	if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
-		if (pit_ != text_.ownerParagraphs().begin()) {
+		if (pit_ != 0) {
 			if (layout->latextype == LATEX_PARAGRAPH
-				&& !pit_->getDepth()) {
+				&& !pars_[pit_].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_);
 				}
@@ -679,11 +613,9 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	int const ww = bv_.workWidth();
-
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
-	bool const is_seq = isFirstInSequence(pit_, text_.ownerParagraphs());
-	//lyxerr << "paintFirst: " << pit_->id() << " is_seq: " << is_seq << std::endl;
+	bool const is_rtl = text_.isRTL(pars_[pit_]);
+	bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+	//lyxerr << "paintFirst: " << pars_[pit_].id() << " is_seq: " << is_seq << std::endl;
 
 	// should we print a label?
 	if (layout->labeltype >= LABEL_STATIC
@@ -692,9 +624,9 @@ void RowPainter::paintFirst()
 		      || is_seq)) {
 
 		LyXFont font = getLabelFont();
-		if (!pit_->getLabelstring().empty()) {
+		if (!pars_[pit_].getLabelstring().empty()) {
 			double x = x_;
-			string const str = pit_->getLabelstring();
+			string const str = pars_[pit_].getLabelstring();
 
 			// this is special code for the chapter layout. This is
 			// printed in an extra row and has a pagebreak at
@@ -713,7 +645,7 @@ void RowPainter::paintFirst()
 						+ int(layout->parsep) * defaultRowHeight();
 
 					if (is_rtl) {
-						x = ww - leftMargin() -
+						x = width_ - leftMargin() -
 							font_metrics::width(str, font);
 					}
 
@@ -724,7 +656,7 @@ void RowPainter::paintFirst()
 				}
 			} 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)
@@ -742,8 +674,8 @@ 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();
+		if (!pars_[pit_].getLabelstring().empty()) {
+			string const str = pars_[pit_].getLabelstring();
 			float spacing_val = 1.0;
 			if (!parparams.spacing().isDefault()) {
 				spacing_val = parparams.spacing().getValue();
@@ -758,10 +690,10 @@ void RowPainter::paintFirst()
 			double x = x_;
 			if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
 				x = ((is_rtl ? leftMargin() : x_)
-					 + ww - text_.rightMargin(*pit_, *bv_.buffer())) / 2;
+					 + width_ - text_.rightMargin(pars_[pit_])) / 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),
@@ -774,22 +706,8 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-	ParagraphParameters const & parparams = pit_->params();
-	int y_bottom = row_.height() - 1;
-
-	// the bottom margin
-	if (text_.isLastRow(pit_, row_) && !text_.isInInset())
-		y_bottom -= PAPER_MARGIN;
-
-	int const ww = bv_.workWidth();
-
-	// draw the additional space if needed:
-	int const height = getLengthMarkerHeight(bv_, parparams.spaceBottom());
-	y_bottom -= paintLengthMarker(_("Space below"), parparams.spaceBottom(),
-			     yo_ + y_bottom - height);
-
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
-	int const endlabel = getEndLabel(pit_, text_.ownerParagraphs());
+	bool const is_rtl = text_.isRTL(pars_[pit_]);
+	int const endlabel = getEndLabel(pit_, text_.paragraphs());
 
 	// draw an endlabel
 	switch (endlabel) {
@@ -798,10 +716,10 @@ void RowPainter::paintLast()
 		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 ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
+		int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: 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);
@@ -812,10 +730,10 @@ void RowPainter::paintLast()
 
 	case END_LABEL_STATIC: {
 		LyXFont font = getLabelFont();
-		string const & str = pit_->layout()->endlabelstring();
+		string const & str = pars_[pit_].layout()->endlabelstring();
 		double const x = is_rtl ?
 			x_ - font_metrics::width(str, font)
-			: ww - text_.rightMargin(*pit_, *bv_.buffer()) - row_.fill();
+			: - text_.rightMargin(pars_[pit_]) - row_.width();
 		pain_.text(int(x), yo_ + row_.baseline(), str, font);
 		break;
 	}
@@ -829,13 +747,13 @@ void RowPainter::paintLast()
 void RowPainter::paintText()
 {
 	pos_type const end = row_.endpos();
-	pos_type body_pos = pit_->beginOfBody();
+	pos_type body_pos = pars_[pit_].beginOfBody();
 	if (body_pos > 0 &&
-		(body_pos > end || !pit_->isLineSeparator(body_pos - 1))) {
+		(body_pos > end || !pars_[pit_].isLineSeparator(body_pos - 1))) {
 		body_pos = 0;
 	}
 
-	LyXLayout_ptr const & layout = pit_->layout();
+	LyXLayout_ptr const & layout = pars_[pit_].layout();
 
 	bool running_strikeout = false;
 	bool is_struckout = false;
@@ -847,7 +765,7 @@ void RowPainter::paintText()
 
 		pos_type pos = text_.bidi.vis2log(vpos);
 
-		if (pos >= pit_->size()) {
+		if (pos >= pars_[pit_].size()) {
 			++vpos;
 			continue;
 		}
@@ -858,15 +776,15 @@ void RowPainter::paintText()
 			continue;
 		}
 
-		is_struckout = isDeletedText(*pit_, pos);
+		is_struckout = isDeletedText(pars_[pit_], 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 = pars_[pit_].isInset(pos)
+			&& isHighlyEditableInset(pars_[pit_].getInset(pos));
 
 		// if we reach the end of a struck out range, paint it
 		// we also don't paint across things like tables
@@ -884,7 +802,7 @@ void RowPainter::paintText()
 			x_ += label_hfill_ + lwidth - singleWidth(body_pos - 1);
 		}
 
-		if (pit_->isHfill(pos)) {
+		if (pars_[pit_].isHfill(pos)) {
 			x_ += 1;
 
 			int const y0 = yo_ + row_.baseline();
@@ -892,7 +810,7 @@ void RowPainter::paintText()
 
 			pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
 
-			if (hfillExpansion(*pit_, row_, pos)) {
+			if (hfillExpansion(pars_[pit_], row_, pos)) {
 				int const y2 = (y0 + y1) / 2;
 
 				if (pos >= body_pos) {
@@ -910,7 +828,7 @@ void RowPainter::paintText()
 			}
 			x_ += 2;
 			++vpos;
-		} else if (pit_->isSeparator(pos)) {
+		} else if (pars_[pit_].isSeparator(pos)) {
 			x_ += singleWidth(pos);
 			if (pos >= body_pos)
 				x_ += separator_;
@@ -930,97 +848,53 @@ void RowPainter::paintText()
 }
 
 
-void RowPainter::paint()
-{
-	// FIXME: what is this fixing ?
-	if (text_.isInInset() && x_ < 0)
-		x_ = 0;
-	x_ += xo_;
-
-	// background has already been cleared.
-	if (&text_ == bv_.text)
-		paintBackground();
-
-	// paint the selection background
-	if (text_.selection.set() && &text_ == bv_.cursor().innerText())
-		paintSelection();
-
-	// vertical lines for appendix
-	paintAppendix();
-
-	// environment depth brackets
-	paintDepthBar();
-
-	// changebar
-	paintChangeBar();
-
-	if (row_.pos() == 0)
-		paintFirst();
-
-	if (row_.endpos() >= pit_->size())
-		paintLast();
-
-	// paint text
-	paintText();
-}
-
-
-int paintPars(BufferView const & bv, LyXText const & text,
-	ParagraphList::iterator pit, int xo, int yo, int y)
+int paintPars(BufferView const & bv, Painter & pain,
+	      LyXText const & text, par_type pit, par_type end)
 {
 	//lyxerr << "  paintRows: pit: " << &*pit << endl;
-	int const y2 = bv.painter().paperHeight();
+	ParagraphList & pars = text.paragraphs();
 
-	ParagraphList::iterator end = text.ownerParagraphs().end();
+	int y = pars[pit].y + text.yo_ - bv.top_y();
+	int const y2 = pain.paperHeight();
 
-	for ( ; pit != end; ++pit) {
-		RowList::iterator row = pit->rows.begin();
-		RowList::iterator rend = pit->rows.end();
+	for (; pit != end; ++pit) {
+		RowList::iterator row = pars[pit].rows.begin();
+		RowList::iterator rend = pars[pit].rows.end();
 
 		for ( ; row != rend; ++row) {
-			RowPainter painter(bv, text, pit, row, y + yo, xo, y + bv.top_y());
-			painter.paint();
+			RowPainter(bv, pain, text, pit, row, y);
 			y += row->height();
+			if (y >= y2)
+				break;
 		}
-		if (yo + y >= y2)
-			break;
-	}
 
+	}
 	return y;
 }
 
+
 } // namespace anon
 
 
-int paintText(BufferView & bv)
+void refreshPar(BufferView const & bv, LyXText const & text, par_type pit)
 {
-	int const topy = bv.top_y();
-	ParagraphList::iterator pit;
-	bv.text->getRowNearY(topy, pit);
-	return paintPars(bv, *bv.text, pit, 0, 0, pit->y - topy);
+
+	static NullPainter nop;
+	paintPars(bv, nop, text, pit, pit + 1);
 }
 
 
-void paintTextInset(BufferView & bv, LyXText & text, int xo, int yo)
+int paintText(BufferView const & bv)
 {
-	paintPars(bv, text, text.ownerParagraphs().begin(), xo, yo, 0);
+	par_type pit, end;
+	getParsInRange(bv.text()->paragraphs(), bv.top_y(),
+		       bv.top_y() + bv.workHeight(), pit, end);
+	//lyxerr << "top_y: " << bv.top_y() << " y: " << pit->y << endl;
+	return paintPars(bv, bv.painter(), *bv.text(), pit, end);
 }
 
 
-int getLengthMarkerHeight(BufferView const & bv, VSpace const & vsp)
+void paintTextInset(LyXText const & text, PainterInfo & pi)
 {
-	if (vsp.kind() == VSpace::NONE)
-		return 0;
-
-	int const arrow_size = 4;
-	int const space_size = vsp.inPixels(bv);
-
-	LyXFont font;
-	font.decSize();
-	int const min_size = max(3 * arrow_size, font_metrics::maxHeight(font));
-
-	if (vsp.length().len().value() < 0.0)
-		return min_size;
-	else
-		return max(min_size, space_size);
+	paintPars(*pi.base.bv, pi.pain, text, 0, text.paragraphs().size());
 }