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

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 7acb3393b4..3b703b58d4 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -14,6 +14,8 @@
 #include "rowpainter.h"
 
 #include "buffer.h"
+#include "cursor.h"
+#include "debug.h"
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "encoding.h"
@@ -30,42 +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 lyx::pos_type;
+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();
@@ -79,9 +73,7 @@ private:
 	void paintHebrewComposeChar(lyx::pos_type & vpos);
 	void paintArabicComposeChar(lyx::pos_type & vpos);
 	void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
-	int paintPageBreak(string const & label, int y);
 	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);
@@ -95,8 +87,6 @@ private:
 	/// return the label font for this row
 	LyXFont const getLabelFont() const;
 
-	char const transformChar(char c, lyx::pos_type pos) const;
-
 	/// return pixel width for the given pos
 	int singleWidth(lyx::pos_type pos) const;
 	int singleWidth(lyx::pos_type pos, char c) const;
@@ -109,18 +99,19 @@ private:
 
 	/// LyXText for the row
 	LyXText const & text_;
+	ParagraphList & pars_;
 
 	/// The row to paint
-	RowList::iterator row_;
+	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_;
@@ -128,12 +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), row_(rit),
-	  pit_(pit), xo_(x_offset), yo_(y_offset), y_(y)
-{}
+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"
@@ -162,39 +188,32 @@ LyXFont const RowPainter::getLabelFont() const
 }
 
 
-char const RowPainter::transformChar(char c, lyx::pos_type pos) const
-{
-	return text_.transformChar(c, *pit_, pos);
-}
-
-
 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->draw(pi, int(x_), yo_ + row_->baseline());
+	inset->drawSelection(pi, int(x_), yo_ + row_.baseline());
+	inset->draw(pi, int(x_), yo_ + row_.baseline());
 	x_ += inset->width();
 }
 
 
 void RowPainter::paintHebrewComposeChar(pos_type & vpos)
 {
-	pos_type pos = text_.vis2log(vpos);
+	pos_type pos = text_.bidi.vis2log(vpos);
 
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
+	char c = pars_[pit_].getChar(pos);
 	str += c;
 	++vpos;
 
@@ -203,11 +222,10 @@ 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);
+				int const width2 = singleWidth(i, c);
 				// dalet / resh
 				dx = (c == 'ø' || c == 'ã')
 					? width2 - width
@@ -218,19 +236,19 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos)
 	}
 
 	// Draw nikud
-	pain_.text(int(x_) + dx, yo_ + row_->baseline(), str, font);
+	pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
 }
 
 
 void RowPainter::paintArabicComposeChar(pos_type & vpos)
 {
-	pos_type pos = text_.vis2log(vpos);
+	pos_type pos = text_.bidi.vis2log(vpos);
 	string str;
 
 	// first char
-	char c = pit_->getChar(pos);
-	c = 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);
@@ -238,55 +256,53 @@ 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);
+				int const width2 = singleWidth(i, c);
 				dx = (width2 - width) / 2;
 			}
 			break;
 		}
 	}
 	// Draw nikud
-	pain_.text(int(x_) + dx, yo_ + row_->baseline(), str, font);
+	pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
 }
 
 
 void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
 {
-	pos_type pos = text_.vis2log(vpos);
-	pos_type const last = lastPos(*pit_, row_);
+	pos_type pos = text_.bidi.vis2log(vpos);
+	pos_type const end = row_.endpos();
 	LyXFont orig_font = getFont(pos);
 
 	// first character
 	string str;
-	str += pit_->getChar(pos);
+	str += pars_[pit_].getChar(pos);
 	if (arabic) {
 		unsigned char c = str[0];
-		str[0] = transformChar(c, pos);
+		str[0] = pars_[pit_].transformChar(c, pos);
 	}
 
-	bool prev_struckout(isDeletedText(*pit_, pos));
-	bool prev_newtext(isInsertedText(*pit_, pos));
-
-	++vpos;
+	bool prev_struckout = isDeletedText(pars_[pit_], pos);
+	bool prev_newtext = isInsertedText(pars_[pit_], pos);
 
 	// collect as much similar chars as we can
-	while (vpos <= last && (pos = text_.vis2log(vpos)) >= 0) {
-		char c = pit_->getChar(pos);
+	for (++vpos; vpos < end && (pos = text_.bidi.vis2log(vpos)) >= 0; ++vpos) {
+		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))
 			break;
+
 		if (hebrew && Encodings::IsComposeChar_hebrew(c))
 			break;
 
@@ -294,21 +310,20 @@ void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
 			break;
 
 		if (arabic)
-			c = transformChar(c, pos);
+			c = pars_[pit_].transformChar(c, pos);
+
 		str += c;
-		++vpos;
 	}
 
-	if (prev_struckout) {
+	if (prev_struckout)
 		orig_font.setColor(LColor::strikeout);
-	} else if (prev_newtext) {
+	else if (prev_newtext)
 		orig_font.setColor(LColor::newtext);
-	}
 
 	// Draw text and set the new x position
-	//lyxerr << "paint row: yo_ " << yo_ << " baseline: " << row_->baseline()
+	//lyxerr << "paint row: yo_ " << yo_ << " baseline: " << row_.baseline()
 	//	<< "\n";
-	pain_.text(int(x_), yo_ + row_->baseline(), str, orig_font);
+	pain_.text(int(x_), yo_ + row_.baseline(), str, orig_font);
 	x_ += font_metrics::width(str, orig_font);
 }
 
@@ -322,20 +337,20 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
 	if (orig_font.language() == bv_.buffer()->params().language)
 		return;
 
-	int const y = yo_ + row_->baseline() + 1;
+	int const y = yo_ + row_.baseline() + 1;
 	pain_.line(int(orig_x), y, int(x_), y, LColor::language);
 }
 
 
 void RowPainter::paintFromPos(pos_type & vpos)
 {
-	pos_type const pos = text_.vis2log(vpos);
+	pos_type const pos = text_.bidi.vis2log(vpos);
 
 	LyXFont const & orig_font = getFont(pos);
 
 	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);
@@ -365,8 +380,6 @@ void RowPainter::paintFromPos(pos_type & vpos)
 	}
 
 	paintForeignMark(orig_x, orig_font);
-
-	return;
 }
 
 
@@ -374,125 +387,117 @@ 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();
+	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());
+	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();
-	RowList::iterator startrow = text_.getRow(text_.selection.start);
-	RowList::iterator endrow = text_.getRow(text_.selection.end);
-
-	if (text_.bidi_same_direction) {
-		int x;
-		int y = yo_;
-		int w;
-		int h = row_->height();
-
-		if (startrow == row_ && endrow == row_) {
-			if (startx < endx) {
-				x = int(xo_) + startx;
-				w = endx - startx;
-				pain_.fillRectangle(x, y, w, h, LColor::selection);
-			} else {
-				x = int(xo_) + endx;
-				w = startx - endx;
-				pain_.fillRectangle(x, y, w, h, LColor::selection);
-			}
-		} else if (startrow == row_) {
-			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 == row_) {
-			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);
-		} else if (y_ > starty && y_ < endy) {
-			pain_.fillRectangle(int(xo_), y, width_, h, LColor::selection);
-		}
-		return;
-	} else if (startrow != row_ && endrow != row_) {
-		if (y_ > starty && y_ < endy) {
-			int w = width_;
-			int h = row_->height();
-			pain_.fillRectangle(int(xo_), yo_, w, h, LColor::selection);
+	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 = 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()) {
+		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_), yo_, width_, h, LColor::selection);
 		}
 		return;
 	}
 
-	if ((startrow != row_ && !is_rtl) || (endrow != row_ && is_rtl))
+	if ((startpit != pit_ && startrow != rit_ && !is_rtl)
+		|| (endpit != pit_ && endrow != rit_ && is_rtl))
 		pain_.fillRectangle(int(xo_), yo_,
-			int(x_), row_->height(), LColor::selection);
+			int(x_), h, LColor::selection);
 
-	pos_type const body_pos = pit_->beginningOfBody();
-	pos_type const last = lastPos(*pit_, row_);
+	pos_type const body_pos = pars_[pit_].beginOfBody();
+	pos_type const end = row_.endpos();
 	double tmpx = x_;
 
-	for (pos_type vpos = row_->pos(); vpos <= last; ++vpos)  {
-		pos_type pos = text_.vis2log(vpos);
+	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();
+			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);
 		}
 
-		if (hfillExpansion(*pit_, row_, pos)) {
-			tmpx += singleWidth(pos);
+		tmpx += singleWidth(pos);
+
+		if (hfillExpansion(pars_[pit_], row_, pos)) {
 			if (pos >= body_pos)
 				tmpx += hfill_;
 			else
 				tmpx += label_hfill_;
-		}
-
-		else if (pit_->isSeparator(pos)) {
-			tmpx += singleWidth(pos);
-			if (pos >= body_pos)
-				tmpx += separator_;
 		} else {
-			tmpx += singleWidth(pos);
+			if (pars_[pit_].isSeparator(pos) && pos >= body_pos)
+				tmpx += separator_;
 		}
 
-		if ((startrow != row_ || text_.selection.start.pos() <= pos) &&
-			(endrow != row_ || 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),
-				row_->height(), LColor::selection);
+				int(tmpx - old_tmpx + 1), h, LColor::selection);
 		}
 	}
 
-	if ((startrow != row_ && is_rtl) || (endrow != row_ && !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),
-				      row_->height(), LColor::selection);
+			yo_, int(width_ - tmpx), h, LColor::selection);
 	}
 }
 
 
 void RowPainter::paintChangeBar()
 {
-	pos_type const start = row_->pos();
-	pos_type const end = lastPos(*pit_, row_);
+	pos_type const start = row_.pos();
+	pos_type const end = row_.endpos();
 
-	if (!pit_->isChanged(start, end))
+	if (start == end || !pars_[pit_].isChanged(start, end - 1))
 		return;
 
-	int const height = (row_ == text_.lastRow())
-		? row_->baseline()
-		: row_->height() + boost::next(row_)->top_of_text();
+	int const height = text_.isLastRow(pit_, row_)
+		? row_.baseline()
+		: row_.height() + boost::next(rit_)->top_of_text();
 
 	pain_.fillRectangle(4, yo_, 5, height, LColor::changebar);
 }
@@ -500,52 +505,49 @@ 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(1, y, 1, 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 (row_ != text_.firstRow()) {
-		ParagraphList::iterator pit2 = pit_;
-		if (row_ == pit2->rows.begin())
+	if (!text_.isFirstRow(pit_, row_)) {
+		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 (row_ != text_.lastRow()) {
-		ParagraphList::iterator pit2 = pit_;
-		if (boost::next(row_) == pit2->rows.end())
+	if (!text_.isLastRow(pit_, row_)) {
+		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_)
+		if (xo_ == 0)
 			x += CHANGEBAR_MARGIN;
-		int const h = yo_ + row_->height() - 1 - (i - next_depth - 1) * 3;
+		int const h = yo_ + row_.height() - 1 - (i - next_depth - 1) * 3;
 
 		pain_.line(x, yo_, x, h, LColor::depthbar);
 
@@ -557,97 +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::paintPageBreak(string const & label, int y)
-{
-	LyXFont pb_font;
-	pb_font.setColor(LColor::pagebreak);
-	pb_font.decSize();
-
-	int w = 0;
-	int a = 0;
-	int d = 0;
-	font_metrics::rectText(label, pb_font, w, a, d);
-
-	int const text_start = int(xo_ + (width_ - w) / 2);
-	int const text_end = text_start + w;
-
-	pain_.rectText(text_start, y + d, label, pb_font, LColor::none, LColor::none);
-
-	pain_.line(int(xo_), y, text_start, y,
-		   LColor::pagebreak, Painter::line_onoffdash);
-	pain_.line(text_end, y, int(xo_ + width_), y,
-		   LColor::pagebreak, Painter::line_onoffdash);
-
-	return 3 * defaultRowHeight();
-}
-
-
 int RowPainter::paintAppendixStart(int y)
 {
 	LyXFont pb_font;
@@ -674,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;
 
@@ -682,33 +593,19 @@ void RowPainter::paintFirst()
 	if (parparams.startOfAppendix())
 		y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
 
-	// the top margin
-	if (row_ == text_.firstRow() && !text_.isInInset())
-		y_top += PAPER_MARGIN;
-
-	// draw a top pagebreak
-	if (parparams.pagebreakTop())
-		y_top += paintPageBreak(_("Page Break (top)"),
-			yo_ + y_top + 2 * defaultRowHeight());
-
-	// 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_);
 				}
@@ -716,35 +613,20 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	int const ww = bv_.workWidth();
-
-	// draw a top line
-	if (parparams.lineTop()) {
-		int const asc = font_metrics::ascent('x', getFont(0));
-
-		y_top += asc;
-
-		int const w = (text_.isInInset() ? text_.inset_owner->width() : ww);
-		int const xp = static_cast<int>(text_.isInInset() ? xo_ : 0);
-		pain_.line(xp, yo_ + y_top, xp + w, yo_ + y_top,
-			LColor::topline, Painter::line_solid,
-			Painter::line_thick);
-
-		y_top += asc;
-	}
-
-	bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+	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
 	    && (layout->labeltype != LABEL_STATIC
-		|| layout->latextype != LATEX_ENVIRONMENT
-		|| isFirstInSequence(pit_, text_.ownerParagraphs()))) {
+		      || layout->latextype != LATEX_ENVIRONMENT
+		      || 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
@@ -763,37 +645,37 @@ void RowPainter::paintFirst()
 						+ int(layout->parsep) * defaultRowHeight();
 
 					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,
+						yo_ + row_.baseline() -
+						row_.ascent_of_text() - maxdesc,
 						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_ + row_.baseline(), str, font);
 			}
 		}
 
 	// the labels at the top of an environment.
 	// More or less for bibliography
-	} else if (isFirstInSequence(pit_, text_.ownerParagraphs()) &&
+	} else if (is_seq &&
 		(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
 		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();
@@ -808,14 +690,14 @@ void RowPainter::paintFirst()
 			double x = x_;
 			if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
 				x = ((is_rtl ? leftMargin() : x_)
-					 + ww - text_.rightMargin(pit_, *bv_.buffer(), *row_)) / 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),
-			    yo_ + row_->baseline() - row_->ascent_of_text() - maxdesc,
+			    yo_ + row_.baseline() - row_.ascent_of_text() - maxdesc,
 				  str, font);
 		}
 	}
@@ -824,57 +706,20 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-	ParagraphParameters const & parparams = pit_->params();
-	int y_bottom = row_->height() - 1;
-
-	// the bottom margin
-	if (row_ == text_.lastRow() && !text_.isInInset())
-		y_bottom -= PAPER_MARGIN;
-
-	int const ww = bv_.workWidth();
-
-	// draw a bottom pagebreak
-	if (parparams.pagebreakBottom()) {
-		y_bottom -= paintPageBreak(_("Page Break (bottom)"),
-			yo_ + y_bottom - 2 * defaultRowHeight());
-	}
-
-	// draw the additional space if needed:
-	int const height = getLengthMarkerHeight(bv_, parparams.spaceBottom());
-	y_bottom -= paintLengthMarker(_("Space below"), parparams.spaceBottom(),
-			     yo_ + y_bottom - height);
-
-	// draw a bottom line
-	if (parparams.lineBottom()) {
-		int const asc = font_metrics::ascent('x',
-			getFont(max(pos_type(0), pit_->size() - 1)));
-
-		y_bottom -= asc;
-
-		int const w = text_.isInInset() ? text_.inset_owner->width() : ww;
-		int const xp = int(text_.isInInset() ? xo_ : 0);
-		int const y = yo_ + y_bottom;
-		pain_.line(xp, y, xp + w, y, LColor::topline, Painter::line_solid,
-			  Painter::line_thick);
-
-		y_bottom -= asc;
-	}
-
-	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) {
 	case END_LABEL_BOX:
-	case END_LABEL_FILLED_BOX:
-	{
+	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 ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
+		int const y = yo_ + row_.baseline() - 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);
@@ -882,16 +727,17 @@ void RowPainter::paintLast()
 			pain_.fillRectangle(x, y, size, size, LColor::eolmarker);
 		break;
 	}
-	case END_LABEL_STATIC:
-	{
+
+	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_) - row_->fill();
-		pain_.text(int(x), yo_ + row_->baseline(), str, font);
+			: - text_.rightMargin(pars_[pit_]) - row_.width();
+		pain_.text(int(x), yo_ + row_.baseline(), str, font);
 		break;
 	}
+
 	case END_LABEL_NO_LABEL:
 		break;
 	}
@@ -900,26 +746,26 @@ void RowPainter::paintLast()
 
 void RowPainter::paintText()
 {
-	pos_type const last = lastPos(*pit_, row_);
-	pos_type body_pos = pit_->beginningOfBody();
+	pos_type const end = row_.endpos();
+	pos_type body_pos = pars_[pit_].beginOfBody();
 	if (body_pos > 0 &&
-		(body_pos - 1 > last || !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;
 	int last_strikeout_x = 0;
 
-	pos_type vpos = row_->pos();
-	while (vpos <= last) {
+	for (pos_type vpos = row_.pos(); vpos < end; ) {
 		if (x_ > bv_.workWidth())
 			break;
-		pos_type pos = text_.vis2log(vpos);
 
-		if (pos >= pit_->size()) {
+		pos_type pos = text_.bidi.vis2log(vpos);
+
+		if (pos >= pars_[pit_].size()) {
 			++vpos;
 			continue;
 		}
@@ -930,21 +776,20 @@ 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
 		if (running_strikeout && (highly_editable_inset || !is_struckout)) {
-			int const middle = yo_ + row_->top_of_text()
-				+ (row_->baseline() - row_->top_of_text()) / 2;
+			int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
 			pain_.line(last_strikeout_x, middle, int(x_), middle,
 				LColor::strikeout, Painter::line_solid, Painter::line_thin);
 			running_strikeout = false;
@@ -957,15 +802,15 @@ 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();
+			int const y0 = yo_ + row_.baseline();
 			int const y1 = y0 - defaultRowHeight() / 2;
 
 			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) {
@@ -983,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_;
@@ -995,8 +840,7 @@ void RowPainter::paintText()
 
 	// if we reach the end of a struck out range, paint it
 	if (running_strikeout) {
-		int const middle = yo_ + row_->top_of_text()
-			+ ((row_->baseline() - row_->top_of_text()) / 2);
+		int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
 		pain_.line(last_strikeout_x, middle, int(x_), middle,
 			LColor::strikeout, Painter::line_solid, Painter::line_thin);
 		running_strikeout = false;
@@ -1004,130 +848,53 @@ void RowPainter::paintText()
 }
 
 
-void RowPainter::paint()
+int paintPars(BufferView const & bv, Painter & pain,
+	      LyXText const & text, par_type pit, par_type end)
 {
-	width_       = text_.workWidth();
-	x_           = row_->x();
-	separator_   = row_->fill_separator();
-	hfill_       = row_->fill_hfill();
-	label_hfill_ = row_->fill_label_hfill();
-
-	// FIXME: what is this fixing ?
-	if (text_.isInInset() && x_ < 0)
-		x_ = 0;
-	x_ += xo_;
-
-	// If we're *not* at the top-level of rows, then the
-	// background has already been cleared.
-	if (&text_ == bv_.text)
-		paintBackground();
+	//lyxerr << "  paintRows: pit: " << &*pit << endl;
+	ParagraphList & pars = text.paragraphs();
 
-	// paint the selection background
-	if (text_.selection.set())
-		paintSelection();
+	int y = pars[pit].y + text.yo_ - bv.top_y();
+	int const y2 = pain.paperHeight();
 
-	// vertical lines for appendix
-	paintAppendix();
-
-	// environment depth brackets
-	paintDepthBar();
-
-	// changebar
-	paintChangeBar();
-
-	if (row_->isParStart())
-		paintFirst();
-
-	if (isParEnd(*pit_, row_))
-		paintLast();
-
-	// paint text
-	paintText();
-}
-
-
-int paintRows(BufferView const & bv, LyXText const & text,
-	ParagraphList::iterator pit, RowList::iterator rit,
-	int xo, int y, int yf, int yo)
-{
-	//lyxerr << "  paintRows: rit: " << &*rit << endl;
-	//const_cast<LyXText&>(text).updateRowPositions();
-	int const yy = yf - y;
-	int const y2 = bv.painter().paperHeight();
-
-	ParagraphList::iterator end = text.ownerParagraphs().end();
-	bool active = false;
-
-	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) {
-			if (row == rit)
-				active = true;
-			if (active) {
-				RowPainter painter(bv, text, pit, row, y + yo, xo, y + bv.top_y());
-				painter.paint();
-				y += row->height();
-				if (yy + y >= y2)
-					return y;
-			} else {
-				//lyxerr << "   paintRows: row: " << &*row << " ignored" << endl;
-			}
+			RowPainter(bv, pain, text, pit, row, y);
+			y += row->height();
+			if (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;
-	RowList::iterator rit = bv.text->getRowNearY(topy, pit);
-	int y = rit->y() - topy;
-	return paintRows(bv, *bv.text, pit, rit, 0, y, y, 0);
+
+	static NullPainter nop;
+	paintPars(bv, nop, text, pit, pit + 1);
 }
 
 
-void paintTextInset(BufferView & bv, LyXText & text, int x, int baseline)
+int paintText(BufferView const & bv)
 {
-	RowList::iterator rit = text.firstRow();
-	RowList::iterator end = text.endRow();
-	ParagraphList::iterator pit = text.ownerParagraphs().begin();
-
-	int y_offset = baseline - rit->ascent_of_text();
-	int y = y_offset;
-	while (rit != end && y + rit->height() <= 0) {
-		y += rit->height();
-		text.nextRow(pit, rit);
-	}
-	if (y_offset < 0)
-		paintRows(bv, text, pit, rit, x, 0, y, y);
-	else
-		paintRows(bv, text, pit, rit, x, 0, y_offset, y_offset);
+	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::maxAscent(font)
-		+ font_metrics::maxDescent(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());
 }