X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.C;h=2cb5b6311abefe4f6583f6b4b3edc2924fd5e762;hb=024275f0690b41634e26dabe8758e3dc6cd31ee2;hp=b387a83ac3a947bffb022bfb0a205303dee5bc22;hpb=c370abab815aa81d8a822830f50bfa3ddf71f743;p=lyx.git

diff --git a/src/rowpainter.C b/src/rowpainter.C
index b387a83ac3..2cb5b6311a 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -25,15 +25,15 @@
 #include "LColor.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
-#include "lyxrow_funcs.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
+#include "ParagraphMetrics.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "TextMetrics.h"
 #include "vspace.h"
 
-#include "frontends/font_metrics.h"
-#include "frontends/nullpainter.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
@@ -42,17 +42,23 @@
 
 #include <boost/crc.hpp>
 
-using lyx::pos_type;
-using lyx::pit_type;
+
+namespace lyx {
+
+using frontend::Painter;
+using frontend::FontMetrics;
 
 using std::endl;
 using std::max;
-using std::min;
 using std::string;
 
 
 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.
  */
@@ -69,16 +75,17 @@ public:
 	void paintFirst();
 	void paintLast();
 	void paintText();
+	int maxWidth() { return max_width_; }
 
 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);
+	void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
+	void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
+	void paintChars(pos_type & vpos, LyXFont const & font,
+			bool hebrew, bool arabic);
 	int paintAppendixStart(int y);
-	void paintFromPos(lyx::pos_type & vpos);
-	void paintInset(lyx::pos_type const pos, LyXFont const & font);
+	void paintFromPos(pos_type & vpos);
+	void paintInset(pos_type const pos, LyXFont const & font);
 
 	/// return left margin
 	int leftMargin() const;
@@ -87,13 +94,14 @@ private:
 	LyXFont const getLabelFont() const;
 
 	/// bufferview to paint on
-	BufferView const & bv_;
+	BufferView & bv_;
 
 	/// Painter to use
 	Painter & pain_;
 
 	/// LyXText for the row
 	LyXText const & text_;
+	TextMetrics & text_metrics_;
 	ParagraphList const & pars_;
 
 	/// The row to paint
@@ -102,6 +110,8 @@ private:
 	/// Row's paragraph
 	pit_type const pit_;
 	Paragraph const & par_;
+	ParagraphMetrics const & pm_;
+	int max_width_;
 
 	/// is row erased? (change tracking)
 	bool erased_;
@@ -119,12 +129,16 @@ private:
 
 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()),
+	: bv_(*pi.base.bv), pain_(pi.pain), text_(text),
+	  text_metrics_(pi.base.bv->textMetrics(&text)),
+	  pars_(text.paragraphs()),
 	  row_(row), pit_(pit), par_(text.paragraphs()[pit]),
+	  pm_(text_metrics_.parMetrics(pit)),
+	  max_width_(bv_.workWidth()),
 	  erased_(pi.erased_),
-	  xo_(x), yo_(y), width_(text_.width())
+	  xo_(x), yo_(y), width_(text_metrics_.width())
 {
-	RowMetrics m = text_.computeRowMetrics(pit, row_);
+	RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_);
 	x_ = m.x + xo_;
 
 	//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
@@ -141,16 +155,21 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 LyXFont const RowPainter::getLabelFont() const
 {
-	return text_.getLabelFont(par_);
+	return text_.getLabelFont(*bv_.buffer(), par_);
 }
 
 
 int RowPainter::leftMargin() const
 {
-	return text_.leftMargin(pit_, row_.pos());
+	return text_.leftMargin(*bv_.buffer(), max_width_, pit_, row_.pos());
 }
 
 
+// If you want to debug inset metrics uncomment the following line:
+// #define DEBUG_METRICS
+// This draws green lines around each inset.
+
+
 void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
 {
 	InsetBase const * inset = par_.getInset(pos);
@@ -162,20 +181,55 @@ void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
 		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_);
-	InsetBase * in = const_cast<InsetBase *>(inset);
+	pi.erased_ = erased_ || par_.isDeleted(pos);
+#ifdef DEBUG_METRICS
+	int const x1 = int(x_);
+#endif
+	bv_.coordCache().insets().add(inset, int(x_), yo_);
+	InsetText const * const in = inset->asTextInset();
 	// non-wide insets are painted completely. Recursive
-	bool tmp = bv_.repaintAll();
-	if (!in->asTextInset() || !static_cast<InsetText*>(in)->Wide()) {
-		bv_.repaintAll(true);
-		lyxerr[Debug::PAINTING] << endl << "Paint inset fully" << endl;
+	bool tmp = refreshInside;
+	if (!in || !in->wide()) {
+		refreshInside = true;
+		if (lyxerr.debugging(Debug::PAINTING)) { 
+			lyxerr << endl << "Paint inset fully" << endl;
+		}
 	}
-	if (bv_.repaintAll())
+	if (refreshInside)
 		inset->drawSelection(pi, int(x_), yo_);
 	inset->draw(pi, int(x_), yo_);
-	bv_.repaintAll(tmp);
+	refreshInside = tmp;
 	x_ += inset->width();
+#ifdef DEBUG_METRICS
+	Dimension dim;
+	BOOST_ASSERT(max_witdh_ > 0);
+	int right_margin = text_metrics_.rightMargin(pm_);
+	int const w = max_witdh_ - leftMargin() - right_margin;
+	MetricsInfo mi(&bv_, font, w);
+	inset->metrics(mi, dim);
+	if (inset->width() > dim.wid) 
+		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
+		       << " draw width " << inset->width()
+		       << "> metrics width " << dim.wid << "." << std::endl;
+	if (inset->ascent() > dim.asc) 
+		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
+		       << " draw ascent " << inset->ascent()
+		       << "> metrics ascent " << dim.asc << "." << std::endl;
+	if (inset->descent() > dim.des) 
+		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
+		       << " draw ascent " << inset->descent()
+		       << "> metrics descent " << dim.des << "." << std::endl;
+	BOOST_ASSERT(inset->width() <= dim.wid);
+	BOOST_ASSERT(inset->ascent() <= dim.asc);
+	BOOST_ASSERT(inset->descent() <= dim.des);
+	int const x2 = x1 + dim.wid;
+	int const y1 = yo_ + dim.des;
+	int const y2 = yo_ - dim.asc;
+	pi.pain.line(x1, y1, x1, y2, LColor::green);
+	pi.pain.line(x1, y1, x2, y1, LColor::green);
+	pi.pain.line(x2, y1, x2, y2, LColor::green);
+	pi.pain.line(x1, y2, x2, y2, LColor::green);
+#endif
 }
 
 
@@ -183,22 +237,26 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
 {
 	pos_type pos = text_.bidi.vis2log(vpos);
 
-	string str;
+	docstring str;
 
 	// first char
-	char c = par_.getChar(pos);
+	char_type c = par_.getChar(pos);
 	str += c;
 	++vpos;
 
-	int const width = font_metrics::width(c, font);
+	int const width = theFontMetrics(font).width(c);
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
 		c = par_.getChar(i);
-		if (!Encodings::IsComposeChar_hebrew(c)) {
-			if (IsPrintableNonspace(c)) {
-				int const width2 =
-					text_.singleWidth(par_, i, c, text_.getFont(par_, i));
+		if (!Encodings::isComposeChar_hebrew(c)) {
+			if (isPrintableNonspace(c)) {
+				int const width2 = text_.singleWidth(par_, i, c,
+					text_.getFont(*bv_.buffer(), par_, i));
+				// FIXME UNICODE
+				// This does not work anymore, and non-ascii
+				// characters in source files are forbidden
+				// anyway.
 				// dalet / resh
 				dx = (c == 'ø' || c == 'ã')
 					? width2 - width
@@ -209,6 +267,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
 	}
 
 	// Draw nikud
+	// FIXME UNICODE
 	pain_.text(int(x_) + dx, yo_, str, font);
 }
 
@@ -216,23 +275,23 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
 void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
 {
 	pos_type pos = text_.bidi.vis2log(vpos);
-	string str;
+	docstring str;
 
 	// first char
-	char c = par_.getChar(pos);
+	char_type c = par_.getChar(pos);
 	c = par_.transformChar(c, pos);
 	str += c;
 	++vpos;
 
-	int const width = font_metrics::width(c, font);
+	int const width = theFontMetrics(font).width(c);
 	int dx = 0;
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
 		c = par_.getChar(i);
-		if (!Encodings::IsComposeChar_arabic(c)) {
-			if (IsPrintableNonspace(c)) {
-				int const width2 = 
-					text_.singleWidth(par_, i, c, text_.getFont(par_, i));
+		if (!Encodings::isComposeChar_arabic(c)) {
+			if (isPrintableNonspace(c)) {
+				int const width2 = text_.singleWidth(par_, i, c,
+						text_.getFont(*bv_.buffer(), par_, i));
 				dx = (width2 - width) / 2;
 			}
 			break;
@@ -242,20 +301,22 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
 	pain_.text(int(x_) + dx, yo_, str, font);
 }
 
-
-void RowPainter::paintChars(pos_type & vpos, LyXFont font, 
+void RowPainter::paintChars(pos_type & vpos, LyXFont const & font,
 			    bool hebrew, bool arabic)
 {
+	// This method takes up 70% of time when typing
 	pos_type pos = text_.bidi.vis2log(vpos);
 	pos_type const end = row_.endpos();
 	FontSpan const font_span = par_.fontSpan(pos);
-	Change::Type const prev_change = par_.lookupChange(pos);
+	Change::Type const prev_change = par_.lookupChange(pos).type;
 
 	// first character
-	string str;
-	str += par_.getChar(pos);
+	std::vector<char_type> str;
+	str.reserve(100);
+	str.push_back(par_.getChar(pos));
+
 	if (arabic) {
-		unsigned char c = str[0];
+		char_type c = str[0];
 		str[0] = par_.transformChar(c, pos);
 	}
 
@@ -265,35 +326,37 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
 		if (pos < font_span.first || pos > font_span.last)
 			break;
 
-		if (prev_change != par_.lookupChange(pos))
+		if (prev_change != par_.lookupChange(pos).type)
 			break;
 
-		char c = par_.getChar(pos);
+		char_type c = par_.getChar(pos);
 
-		if (!IsPrintableNonspace(c))
+		if (!isPrintableNonspace(c))
 			break;
 
-		if (arabic && Encodings::IsComposeChar_arabic(c))
+		if (arabic && Encodings::isComposeChar_arabic(c))
 			break;
 
-		if (hebrew && Encodings::IsComposeChar_hebrew(c))
+		if (hebrew && Encodings::isComposeChar_hebrew(c))
 			break;
 
 		if (arabic)
 			c = par_.transformChar(c, pos);
 
-		str += c;
+		str.push_back(c);
 	}
 
-	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_ << "\n";
-	pain_.text(int(x_), yo_, str, font);
-	x_ += font_metrics::width(str, font);
+	if (prev_change != Change::UNCHANGED) {
+		LyXFont copy(font);
+		if (prev_change == Change::DELETED) {
+			copy.setColor(LColor::strikeout);
+		} else if (prev_change == Change::INSERTED) {
+			copy.setColor(LColor::newtext);
+		}
+		x_ += pain_.text(int(x_), yo_, &str[0], str.size(), copy);
+	} else {
+		x_ += pain_.text(int(x_), yo_, &str[0], str.size(), font);
+	}
 }
 
 
@@ -314,7 +377,7 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
 void RowPainter::paintFromPos(pos_type & vpos)
 {
 	pos_type const pos = text_.bidi.vis2log(vpos);
-	LyXFont orig_font = text_.getFont(par_, pos);
+	LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos);
 
 	double const orig_x = x_;
 
@@ -327,7 +390,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 	}
 
 	// usual characters, no insets
-	char const c = par_.getChar(pos);
+	char_type const c = par_.getChar(pos);
 
 	// special case languages
 	std::string const & lang = orig_font.language()->lang();
@@ -338,8 +401,8 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
 	// draw as many chars as we can
 	if ((!hebrew && !arabic)
-		|| (hebrew && !Encodings::IsComposeChar_hebrew(c))
-		|| (arabic && !Encodings::IsComposeChar_arabic(c))) {
+		|| (hebrew && !Encodings::isComposeChar_hebrew(c))
+		|| (arabic && !Encodings::isComposeChar_arabic(c))) {
 		paintChars(vpos, orig_font, hebrew, arabic);
 	} else if (hebrew) {
 		paintHebrewComposeChar(vpos, orig_font);
@@ -354,7 +417,13 @@ void RowPainter::paintFromPos(pos_type & vpos)
 void RowPainter::paintChangeBar()
 {
 	pos_type const start = row_.pos();
-	pos_type const end = row_.endpos();
+	pos_type end = row_.endpos();
+
+	if (par_.size() == end) {
+		// this is the last row of the paragraph;
+		// thus, we must also consider the imaginary end-of-par character
+		end++;
+	}
 
 	if (start == end || !par_.isChanged(start, end))
 		return;
@@ -363,7 +432,7 @@ void RowPainter::paintChangeBar()
 		? row_.ascent()
 		: row_.height();
 
-	pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar);
+	pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, LColor::changebar);
 }
 
 
@@ -384,12 +453,12 @@ void RowPainter::paintAppendix()
 
 void RowPainter::paintDepthBar()
 {
-	Paragraph::depth_type const depth = par_.getDepth();
+	depth_type const depth = par_.getDepth();
 
 	if (depth <= 0)
 		return;
 
-	Paragraph::depth_type prev_depth = 0;
+	depth_type prev_depth = 0;
 	if (!text_.isFirstRow(pit_, row_)) {
 		pit_type pit2 = pit_;
 		if (row_.pos() == 0)
@@ -397,7 +466,7 @@ void RowPainter::paintDepthBar()
 		prev_depth = pars_[pit2].getDepth();
 	}
 
-	Paragraph::depth_type next_depth = 0;
+	depth_type next_depth = 0;
 	if (!text_.isLastRow(pit_, row_)) {
 		pit_type pit2 = pit_;
 		if (row_.endpos() >= pars_[pit2].size())
@@ -405,11 +474,11 @@ void RowPainter::paintDepthBar()
 		next_depth = pars_[pit2].getDepth();
 	}
 
-	for (Paragraph::depth_type i = 1; i <= depth; ++i) {
+	for (depth_type i = 1; i <= depth; ++i) {
 		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())
+		if (text_.isMainText(*bv_.buffer()))
 			x += changebarMargin();
 
 		int const starty = yo_ - row_.ascent();
@@ -431,11 +500,12 @@ int RowPainter::paintAppendixStart(int y)
 	pb_font.setColor(LColor::appendix);
 	pb_font.decSize();
 
-	string const label = _("Appendix");
 	int w = 0;
 	int a = 0;
 	int d = 0;
-	font_metrics::rectText(label, pb_font, w, a, d);
+
+	docstring const label = _("Appendix");
+	theFontMetrics(pb_font).rectText(label, w, a, d);
 
 	int const text_start = int(xo_ + (width_ - w) / 2);
 	int const text_end = text_start + w;
@@ -479,7 +549,7 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	bool const is_rtl = text_.isRTL(par_);
+	bool const is_rtl = text_.isRTL(buffer, par_);
 	bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
 	//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
 
@@ -490,7 +560,9 @@ void RowPainter::paintFirst()
 		      || is_seq)) {
 
 		LyXFont const font = getLabelFont();
-		string const str = par_.getLabelstring();
+		FontMetrics const & fm = theFontMetrics(font);
+
+		docstring const str = par_.getLabelstring();
 		if (!str.empty()) {
 			double x = x_;
 
@@ -505,24 +577,26 @@ void RowPainter::paintFirst()
 					spacing_val = buffer.params().spacing().getValue();
 				}
 
-				int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
+				int const labeladdon = int(fm.maxHeight() * layout->spacing.getValue() * spacing_val);
 
-				int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+				int const maxdesc = int(fm.maxDescent() * layout->spacing.getValue() * spacing_val)
 					+ int(layout->parsep) * defaultRowHeight();
 
 				if (is_rtl) {
 					x = width_ - leftMargin() -
-						font_metrics::width(str, font);
+						fm.width(str);
 				}
 
 				pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 			} else {
+				// FIXME UNICODE
+				docstring lab = from_utf8(layout->labelsep);
 				if (is_rtl) {
 					x = width_ - leftMargin()
-						+ font_metrics::width(layout->labelsep, font);
+						+ fm.width(lab);
 				} else {
-					x = x_ - font_metrics::width(layout->labelsep, font)
-						- font_metrics::width(str, font);
+					x = x_ - fm.width(lab)
+						- fm.width(str);
 				}
 
 				pain_.text(int(x), yo_, str, font);
@@ -537,28 +611,30 @@ void RowPainter::paintFirst()
 		layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
 		LyXFont font = getLabelFont();
 		if (!par_.getLabelstring().empty()) {
-			string const str = par_.getLabelstring();
+			docstring const str = par_.getLabelstring();
 			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);
+			FontMetrics const & fm = theFontMetrics(font);
+
+			int const labeladdon = int(fm.maxHeight()
+				* layout->spacing.getValue() * spacing_val);
 
 			int maxdesc =
-				int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
+				int(fm.maxDescent() * layout->spacing.getValue() * spacing_val
 				+ (layout->labelbottomsep * defaultRowHeight()));
 
 			double x = x_;
 			if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
 				if (is_rtl)
 					x = leftMargin();
-				x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
-				x -= font_metrics::width(str, font) / 2;
+				x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
+				x -= fm.width(str) / 2;
 			} else if (is_rtl) {
-				x = width_ - leftMargin() -
-					font_metrics::width(str, font);
+				x = width_ - leftMargin() -	fm.width(str);
 			}
 			pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 		}
@@ -568,15 +644,30 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-	bool const is_rtl = text_.isRTL(par_);
+	bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
 	int const endlabel = getEndLabel(pit_, text_.paragraphs());
 
+	// paint imaginary end-of-paragraph character
+
+	if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
+		FontMetrics const & fm = theFontMetrics(bv_.buffer()->params().getFont());
+		int const length = fm.maxAscent() / 2;
+		LColor::color col = par_.isInserted(par_.size()) ? LColor::newtext : LColor::strikeout;
+		
+		pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
+		           Painter::line_solid, Painter::line_thick);
+		pain_.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
+		           Painter::line_solid, Painter::line_thick);
+	}
+
 	// draw an endlabel
+
 	switch (endlabel) {
 	case END_LABEL_BOX:
 	case END_LABEL_FILLED_BOX: {
 		LyXFont const font = getLabelFont();
-		int const size = int(0.75 * font_metrics::maxAscent(font));
+		FontMetrics const & fm = theFontMetrics(font);
+		int const size = int(0.75 * fm.maxAscent());
 		int const y = yo_ - size;
 		int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
 
@@ -592,10 +683,11 @@ void RowPainter::paintLast()
 
 	case END_LABEL_STATIC: {
 		LyXFont font = getLabelFont();
-		string const & str = par_.layout()->endlabelstring();
+		FontMetrics const & fm = theFontMetrics(font);
+		docstring const & str = par_.layout()->endlabelstring();
 		double const x = is_rtl ?
-			x_ - font_metrics::width(str, font)
-			: - text_.rightMargin(par_) - row_.width();
+			x_ - fm.width(str)
+			: - text_metrics_.rightMargin(pm_) - row_.width();
 		pain_.text(int(x), yo_, str, font);
 		break;
 	}
@@ -621,9 +713,10 @@ void RowPainter::paintText()
 	bool is_struckout = false;
 	int last_strikeout_x = 0;
 
-	// Use font span to speed things up, see below 
+	// Use font span to speed things up, see below
 	FontSpan font_span;
 	LyXFont font;
+	Buffer const & buffer = *bv_.buffer();
 
 	for (pos_type vpos = row_.pos(); vpos < end; ) {
 		if (x_ > bv_.workWidth())
@@ -639,7 +732,7 @@ void RowPainter::paintText()
 		// 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);
+			font = text_.getFont(buffer, par_, vpos);
 		}
 
 		const int width_pos =
@@ -651,7 +744,7 @@ void RowPainter::paintText()
 			continue;
 		}
 
-		is_struckout = isDeletedText(par_, pos);
+		is_struckout = par_.isDeleted(pos);
 
 		if (is_struckout && !running_strikeout) {
 			running_strikeout = true;
@@ -665,17 +758,18 @@ void RowPainter::paintText()
 		// We also don't paint across things like tables
 		if (running_strikeout && (highly_editable_inset || !is_struckout)) {
 			// Calculate 1/3 height of the buffer's default font
-			int const middle =
-				yo_ -
-				font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
+			FontMetrics const & fm 
+				= theFontMetrics(bv_.buffer()->params().getFont());
+			int const middle = yo_ - fm.maxAscent() / 3;
 			pain_.line(last_strikeout_x, middle, int(x_), middle,
 				LColor::strikeout, Painter::line_solid, Painter::line_thin);
 			running_strikeout = false;
 		}
 
 		if (body_pos > 0 && pos == body_pos - 1) {
-			int const lwidth = font_metrics::width(layout->labelsep,
-				getLabelFont());
+			// FIXME UNICODE
+			int const lwidth = theFontMetrics(getLabelFont())
+				.width(from_utf8(layout->labelsep));
 
 			x_ += label_hfill_ + lwidth - width_pos;
 		}
@@ -688,7 +782,7 @@ void RowPainter::paintText()
 
 			pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
 
-			if (hfillExpansion(par_, row_, pos)) {
+			if (par_.hfillExpansion(row_, pos)) {
 				int const y2 = (y0 + y1) / 2;
 
 				if (pos >= body_pos) {
@@ -719,9 +813,9 @@ void RowPainter::paintText()
 	// if we reach the end of a struck out range, paint it
 	if (running_strikeout) {
 		// calculate 1/3 height of the buffer's default font
-		int const middle =
-			yo_ -
-			font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
+		FontMetrics const & fm 
+			= theFontMetrics(bv_.buffer()->params().getFont());
+		int const middle = yo_ - fm.maxAscent() / 3;
 		pain_.line(last_strikeout_x, middle, int(x_), middle,
 			LColor::strikeout, Painter::line_solid, Painter::line_thin);
 		running_strikeout = false;
@@ -729,30 +823,16 @@ void RowPainter::paintText()
 }
 
 
-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, 
+bool CursorOnRow(PainterInfo & pi, pit_type const pit,
 	RowList::const_iterator rit, LyXText const & text)
 {
 	// 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++) {
+	for (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->pos()
 		    && sl.pos() <= rit->endpos())
 			return true;
 	}
@@ -760,7 +840,7 @@ bool CursorOnRow(PainterInfo & pi, pit_type const pit,
 }
 
 
-bool innerCursorOnRow(PainterInfo & pi, pit_type pit, 
+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
@@ -768,10 +848,10 @@ bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
 	LCursor & cur = pi.base.bv->cursor();
 	if (rit->pos() + 1 != rit->endpos())
 		return false;
-	for (lyx::size_type d = 0; d < cur.depth(); d++) {
+	for (size_type d = 0; d < cur.depth(); d++) {
 		CursorSlice const & sl = cur[d];
 		if (sl.text() == &text
-		    && sl.pit() == pit 
+		    && sl.pit() == pit
 		    && sl.pos() == rit->pos())
 			return d < cur.depth() - 1;
 	}
@@ -784,146 +864,151 @@ void paintPar
 	 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();
 
+	pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
+
 	Paragraph const & par = text.paragraphs()[pit];
+	ParagraphMetrics const & pm = pi.base.bv->parMetrics(&text, pit);
+	if (pm.rows().empty())
+		return;
 
-	RowList::const_iterator const rb = par.rows().begin();
-	RowList::const_iterator const re = par.rows().end();
-	theCoords.parPos()[&text][pit] = Point(x, y);
+	RowList::const_iterator const rb = pm.rows().begin();
+	RowList::const_iterator const re = pm.rows().end();
 
 	y -= rb->ascent();
-	lyx::size_type rowno(0);
+	size_type rowno = 0;
 	for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
 		y += rit->ascent();
-		// Allow setting of bv->repaintAll() for nested insets in
+		// Allow setting of refreshInside for nested insets in
 		// this row only
-		bool tmp = pi.base.bv->repaintAll();
+		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 row_has_changed = pm.rowChangeStatus()[rowno];
+
 		bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
 		bool in_inset_alone_on_row = innerCursorOnRow(pi, pit, rit,
 			text);
+		bool leftEdgeFixed = 
+			(par.getAlign() == LYX_ALIGN_LEFT ||
+			 par.getAlign() == LYX_ALIGN_BLOCK);
 
 		// If this is the only object on the row, we can make it wide
+		//
+		// FIXME: there is a const_cast here because paintPar() is not supposed
+		// to touch the paragraph contents. So either we move this "wide"
+		// property out of InsetText or we localize the feature to the painting
+		// done here.
 		for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
-			InsetBase* in 
-			    = const_cast<InsetBase*>(par.getInset(i));
-			if (in && in->asTextInset()) {
-				static_cast<InsetText*>(in)->Wide()
-				    = in_inset_alone_on_row  &&
-					static_cast<InsetText*>(in)->Tall();
+			InsetBase const * const in = par.getInset(i);
+			if (in) {
+				InsetText * t = const_cast<InsetText *>(in->asTextInset());
+				if (t)
+					t->setWide(in_inset_alone_on_row && leftEdgeFixed);
 			}
 		}
 
-		// If selection is on, the current row signature differs 
-		// from cache, or cursor is inside an inset _on this row_, 
+		// 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 
+				&& y - rit->ascent() < ww);
+			// it is not needed to draw on screen if we are not inside.
+			pi.pain.setDrawingEnabled(inside);
+			RowPainter rp(pi, 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(( rowno ? 0 : x - 10 ), y - rit->ascent(), 
-				    pi.base.bv->workWidth(), rit->height(),
+			if (!repaintAll &&
+			    (!(in_inset_alone_on_row && leftEdgeFixed) 
+				|| row_has_changed)) {
+				pi.pain.fillRectangle(x, y - rit->ascent(),
+				    rp.maxWidth(), rit->height(),
 				    text.backgroundColor());
 				// If outer row has changed, force nested
 				// insets to repaint completely
 				if (row_has_changed)
-					pi.base.bv->repaintAll(true);
+					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 << "]";
+			if (lyxerr.debugging(Debug::PAINTING)) {
+				if (text.isMainText(*pi.base.bv->buffer()))
+					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();
+ 			rp.paintText();
 			if (rit + 1 == re)
 				rp.paintLast();
-			rp.paintText();
 		}
 		y += rit->descent();
 		// Restore, see above
-		pi.base.bv->repaintAll(tmp);
+		refreshInside = tmp;
+	}
+	// Re-enable screen drawing for future use of the painter.
+	pi.pain.setDrawingEnabled(true);
+
+	if (lyxerr.debugging(Debug::PAINTING)) {
+		lyxerr[Debug::PAINTING] << "." << endl;
 	}
-	lyxerr[Debug::PAINTING] << "." << endl;
 }
 
 } // namespace anon
 
 
-void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
+void paintText(BufferView & bv,
+	       Painter & pain)
 {
-	Painter & pain = bv.painter();
-	LyXText * const text = bv.text();
+	BOOST_ASSERT(bv.buffer());
+	Buffer const & buffer = *bv.buffer();
+	LyXText & text = buffer.text();
 	bool const select = bv.cursor().selection();
-
+	ViewMetricsInfo const & vi = bv.viewMetricsInfo();
+	
 	PainterInfo pi(const_cast<BufferView *>(&bv), pain);
 	// Should the whole screen, including insets, be refreshed?
-	bool repaintAll(select || !vi.singlepar);
-	
+	// FIXME: We should also distinguish DecorationUpdate to avoid text
+	// drawing if possible. This is not possible to do easily right now
+	// because of the single backing pixmap.
+	bool repaintAll = select || vi.update_strategy != SingleParUpdate;
+
 	if (repaintAll) {
 		// Clear background (if not delegated to rows)
 		pain.fillRectangle(0, vi.y1, bv.workWidth(), vi.y2 - vi.y1,
-			text->backgroundColor());
+			text.backgroundColor());
 	}
 	if (select) {
-		text->drawSelection(pi, 0, 0);
+		text.drawSelection(pi, 0, 0);
 	}
 
 	int yy = vi.y1;
 	// draw contents
 	for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
-		bv.repaintAll(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());
+		refreshInside = repaintAll;
+		ParagraphMetrics const & pm = bv.parMetrics(&text, pit);
+		yy += pm.ascent();
+		paintPar(pi, text, pit, 0, yy, repaintAll);
+		yy += pm.descent();
 	}
 
 	// and grey out above (should not happen later)
-//	lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
-	if (vi.y1 > 0 && !vi.singlepar)
+//	lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl;
+	if (vi.y1 > 0 && vi.update_strategy != SingleParUpdate)
 		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)
+//	lyxerr << "par descent: " << text.getPar(vi.p1).ascent() << endl;
+	if (vi.y2 < bv.workHeight() && vi.update_strategy != SingleParUpdate)
 		pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
 }
 
@@ -932,12 +1017,17 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
 {
 //	lyxerr << "  paintTextInset: y: " << y << endl;
 
-	y -= text.getPar(0).ascent();
-	// This flag can not be set from within same inset:
-	bool repaintAll = pi.base.bv->repaintAll();
+	y -= pi.base.bv->parMetrics(&text, 0).ascent();
+	// This flag cannot be set from within same inset:
+	bool repaintAll = refreshInside;
 	for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
-		y += text.getPar(pit).ascent();
+		ParagraphMetrics const & pmi 
+			= pi.base.bv->parMetrics(&text, pit);
+		y += pmi.ascent();
 		paintPar(pi, text, pit, x, y, repaintAll);
-		y += text.getPar(pit).descent();
+		y += pmi.descent();
 	}
 }
+
+
+} // namespace lyx