]> git.lyx.org Git - lyx.git/blobdiff - src/rowpainter.cpp
adjust
[lyx.git] / src / rowpainter.cpp
index ca3a07ef4bd05560a41f902f41ce0f22d6a23b98..9ed482c9905957b239342b7cbc1595b6dbab79f8 100644 (file)
@@ -16,6 +16,7 @@
 #include "Bidi.h"
 #include "Buffer.h"
 #include "CoordCache.h"
+#include "Color.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "BufferParams.h"
@@ -23,7 +24,7 @@
 #include "Encoding.h"
 #include "gettext.h"
 #include "Language.h"
-#include "Color.h"
+#include "Layout.h"
 #include "LyXRC.h"
 #include "Row.h"
 #include "MetricsInfo.h"
 
 #include <boost/crc.hpp>
 
-
-namespace lyx {
-
-using frontend::Painter;
-using frontend::FontMetrics;
-
 using std::endl;
 using std::max;
 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.
- */
-class RowPainter {
-public:
-       /// initialise and run painter
-       RowPainter(PainterInfo & pi, Text const & text,
-               pit_type pit, Row const & row, Bidi & bidi, int x, int y);
-
-       // paint various parts
-       void paintAppendix();
-       void paintDepthBar();
-       void paintChangeBar();
-       void paintFirst();
-       void paintLast();
-       void paintText();
-       int maxWidth() { return max_width_; }
-
-private:
-       void paintForeignMark(double orig_x, Font const & font, int desc = 0);
-       void paintHebrewComposeChar(pos_type & vpos, Font const & font);
-       void paintArabicComposeChar(pos_type & vpos, Font const & font);
-       void paintChars(pos_type & vpos, Font const & font,
-                       bool hebrew, bool arabic);
-       int paintAppendixStart(int y);
-       void paintFromPos(pos_type & vpos);
-       void paintInset(pos_type const pos, Font const & font);
-
-       /// return left margin
-       int leftMargin() const;
-
-       /// return the label font for this row
-       Font const getLabelFont() const;
-
-       /// bufferview to paint on
-       BufferView & bv_;
-
-       /// Painter to use
-       Painter & pain_;
-
-       /// Text for the row
-       Text const & text_;
-       TextMetrics & text_metrics_;
-       ParagraphList const & pars_;
-
-       /// The row to paint
-       Row const & row_;
-
-       /// Row's paragraph
-       pit_type const pit_;
-       Paragraph const & par_;
-       ParagraphMetrics const & pm_;
-       int max_width_;
-
-       /// bidi cache, comes from outside the rowpainter because
-       /// rowpainters are normally created in a for loop and there only
-       /// one of them is active at a time.
-       Bidi & bidi_;
-
-       /// is row erased? (change tracking)
-       bool erased_;
-
-       // Looks ugly - is
-       double const xo_;
-       int const yo_;    // current baseline
-       double x_;
-       int width_;
-       double separator_;
-       double hfill_;
-       double label_hfill_;
-};
+namespace lyx {
 
+using frontend::Painter;
+using frontend::FontMetrics;
 
 RowPainter::RowPainter(PainterInfo & pi,
        Text const & text, pit_type pit, Row const & row, Bidi & bidi, int x, int y)
-       : bv_(*pi.base.bv), pain_(pi.pain), text_(text),
-         text_metrics_(pi.base.bv->textMetrics(&text)),
+       : pi_(pi), 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()),
-               bidi_(bidi), erased_(pi.erased_),
+         bidi_(bidi), erased_(pi_.erased_),
          xo_(x), yo_(y), width_(text_metrics_.width())
 {
-       RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_);
-       bidi_.computeTables(par_, bv_.buffer(), row_);
-       x_ = m.x + xo_;
+       bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
+       x_ = row_.x + xo_;
 
        //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
        //row_.dump();
 
-       separator_ = m.separator;
-       hfill_ = m.hfill;
-       label_hfill_ = m.label_hfill;
-
        BOOST_ASSERT(pit >= 0);
        BOOST_ASSERT(pit < int(text.paragraphs().size()));
 }
@@ -162,78 +77,104 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 Font const RowPainter::getLabelFont() const
 {
-       return text_.getLabelFont(bv_.buffer(), par_);
+       return text_.getLabelFont(pi_.base.bv->buffer(), par_);
 }
 
 
 int RowPainter::leftMargin() const
 {
-       return text_.leftMargin(bv_.buffer(), max_width_, pit_, row_.pos());
+       return text_metrics_.leftMargin(text_metrics_.width(), pit_,
+               row_.pos());
+}
+
+
+void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
+{
+       x_ += 1;
+
+       int const y0 = yo_;
+       int const y1 = y0 - defaultRowHeight() / 2;
+
+       pi_.pain.line(int(x_), y1, int(x_), y0, Color::added_space);
+
+       if (pm_.hfillExpansion(row_, pos)) {
+               int const y2 = (y0 + y1) / 2;
+
+               if (pos >= body_pos) {
+                       pi_.pain.line(int(x_), y2, int(x_ + row_.hfill), y2,
+                               Color::added_space,
+                               Painter::line_onoffdash);
+                       x_ += row_.hfill;
+               } else {
+                       pi_.pain.line(int(x_), y2, int(x_ + row_.label_hfill), y2,
+                               Color::added_space,
+                               Painter::line_onoffdash);
+                       x_ += row_.label_hfill;
+               }
+               pi_.pain.line(int(x_), y1, int(x_), y0, Color::added_space);
+       }
+       x_ += 2;
 }
 
 
 // If you want to debug inset metrics uncomment the following line:
-// #define DEBUG_METRICS
+//#define DEBUG_METRICS
 // This draws green lines around each inset.
 
 
-void RowPainter::paintInset(pos_type const pos, Font const & font)
+void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 {
-       Inset const * inset = par_.getInset(pos);
+       Font font = text_metrics_.getDisplayFont(pit_, pos);
+
        BOOST_ASSERT(inset);
-       PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
        // FIXME: We should always use font, see documentation of
        // noFontChange() in Inset.h.
-       pi.base.font = inset->noFontChange() ?
-               bv_.buffer().params().getFont() :
+       pi_.base.font = inset->noFontChange() ?
+               pi_.base.bv->buffer().params().getFont() :
                font;
-       pi.ltr_pos = (bidi_.level(pos) % 2 == 0);
-       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 = refreshInside;
-       if (!in || !in->wide()) {
-               refreshInside = true;
-               LYXERR(Debug::PAINTING) << endl << "Paint inset fully" << endl;
-       }
-       if (refreshInside)
-               inset->drawSelection(pi, int(x_), yo_);
-       inset->draw(pi, int(x_), yo_);
-       refreshInside = tmp;
-       x_ += inset->width();
+       pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
+       pi_.erased_ = erased_ || par_.isDeleted(pos);
+       pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
+       // insets are painted completely. Recursive
+       inset->drawSelection(pi_, int(x_), yo_);
+       inset->draw(pi_, int(x_), yo_);
+
+       Dimension const & dim = pm_.insetDimension(inset);
+
+       paintForeignMark(x_, font, dim.descent());
+
+       x_ += dim.width();
+
 #ifdef DEBUG_METRICS
-       Dimension dim;
+       int const x1 = int(x_ - dim.width());
+       Dimension dim2;
        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)
+       MetricsInfo mi(pi_.base.bv, font, w);
+       inset->metrics(mi, dim2);
+       if (dim.wid != dim2.wid)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
-                      << " draw width " << inset->width()
-                      << "> metrics width " << dim.wid << "." << std::endl;
-       if (inset->ascent() > dim.asc)
+                      << " draw width " << dim.width()
+                      << "> metrics width " << dim2.wid << "." << std::endl;
+       if (dim->asc != dim2.asc)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
-                      << " draw ascent " << inset->ascent()
-                      << "> metrics ascent " << dim.asc << "." << std::endl;
-       if (inset->descent() > dim.des)
+                      << " draw ascent " << dim.ascent()
+                      << "> metrics ascent " << dim2.asc << "." << std::endl;
+       if (dim2.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);
+                      << " draw ascent " << dim.descent()
+                      << "> metrics descent " << dim2.des << "." << std::endl;
+       BOOST_ASSERT(dim2.wid == dim.wid);
+       BOOST_ASSERT(dim2.asc == dim.asc);
+       BOOST_ASSERT(dim2.des == 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, Color::green);
-       pi.pain.line(x1, y1, x2, y1, Color::green);
-       pi.pain.line(x2, y1, x2, y2, Color::green);
-       pi.pain.line(x1, y2, x2, y2, Color::green);
+       pi_.pain.line(x1, y1, x1, y2, Color::green);
+       pi_.pain.line(x1, y1, x2, y1, Color::green);
+       pi_.pain.line(x2, y1, x2, y2, Color::green);
+       pi_.pain.line(x1, y2, x2, y2, Color::green);
 #endif
 }
 
@@ -257,7 +198,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
                if (!Encodings::isComposeChar_hebrew(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 = pm_.singleWidth(i,
-                                       text_.getFont(bv_.buffer(), par_, i));
+                                       text_metrics_.getDisplayFont(pit_, i));
                                dx = (c == 0x05e8 || // resh
                                      c == 0x05d3)   // dalet
                                        ? width2 - width
@@ -268,7 +209,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
        }
 
        // Draw nikud
-       pain_.text(int(x_) + dx, yo_, str, font);
+       pi_.pain.text(int(x_) + dx, yo_, str, font);
 }
 
 
@@ -291,14 +232,14 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
                if (!Encodings::isComposeChar_arabic(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 = pm_.singleWidth(i,
-                                               text_.getFont(bv_.buffer(), par_, i));
+                                               text_metrics_.getDisplayFont(pit_, i));
                                dx = (width2 - width) / 2;
                        }
                        break;
                }
        }
        // Draw nikud
-       pain_.text(int(x_) + dx, yo_, str, font);
+       pi_.pain.text(int(x_) + dx, yo_, str, font);
 }
 
 
@@ -387,9 +328,9 @@ void RowPainter::paintChars(pos_type & vpos, Font const & font,
                } else if (prev_change == Change::INSERTED) {
                        copy.setColor(Color::addedtext);
                }
-               x_ += pain_.text(int(x_), yo_, s, copy);
+               x_ += pi_.pain.text(int(x_), yo_, s, copy);
        } else {
-               x_ += pain_.text(int(x_), yo_, s, font);
+               x_ += pi_.pain.text(int(x_), yo_, s, font);
        }
 }
 
@@ -400,29 +341,20 @@ void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
                return;
        if (font.language() == latex_language)
                return;
-       if (font.language() == bv_.buffer().params().language)
+       if (font.language() == pi_.base.bv->buffer().params().language)
                return;
 
        int const y = yo_ + 1 + desc;
-       pain_.line(int(orig_x), y, int(x_), y, Color::language);
+       pi_.pain.line(int(orig_x), y, int(x_), y, Color::language);
 }
 
 
 void RowPainter::paintFromPos(pos_type & vpos)
 {
        pos_type const pos = bidi_.vis2log(vpos);
-       Font orig_font = text_.getFont(bv_.buffer(), par_, pos);
-
+       Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
        double const orig_x = x_;
 
-       if (par_.isInset(pos)) {
-               paintInset(pos, orig_font);
-               ++vpos;
-               paintForeignMark(orig_x, orig_font,
-                       par_.getInset(pos)->descent());
-               return;
-       }
-
        // usual characters, no insets
        char_type const c = par_.getChar(pos);
 
@@ -461,18 +393,18 @@ void RowPainter::paintChangeBar()
        if (start == end || !par_.isChanged(start, end))
                return;
 
-       int const height = text_.isLastRow(pit_, row_)
+       int const height = text_metrics_.isLastRow(pit_, row_)
                ? row_.ascent()
                : row_.height();
 
-       pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color::changebar);
+       pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color::changebar);
 }
 
 
 void RowPainter::paintAppendix()
 {
        // only draw the appendix frame once (for the main text)
-       if (!par_.params().appendix() || !text_.isMainText(bv_.buffer()))
+       if (!par_.params().appendix() || !text_.isMainText(pi_.base.bv->buffer()))
                return;
 
        int y = yo_ - row_.ascent();
@@ -480,8 +412,8 @@ void RowPainter::paintAppendix()
        if (par_.params().startOfAppendix())
                y += 2 * defaultRowHeight();
 
-       pain_.line(1, y, 1, yo_ + row_.height(), Color::appendix);
-       pain_.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color::appendix);
+       pi_.pain.line(1, y, 1, yo_ + row_.height(), Color::appendix);
+       pi_.pain.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color::appendix);
 }
 
 
@@ -493,7 +425,7 @@ void RowPainter::paintDepthBar()
                return;
 
        depth_type prev_depth = 0;
-       if (!text_.isFirstRow(pit_, row_)) {
+       if (!text_metrics_.isFirstRow(pit_, row_)) {
                pit_type pit2 = pit_;
                if (row_.pos() == 0)
                        --pit2;
@@ -501,7 +433,7 @@ void RowPainter::paintDepthBar()
        }
 
        depth_type next_depth = 0;
-       if (!text_.isLastRow(pit_, row_)) {
+       if (!text_metrics_.isLastRow(pit_, row_)) {
                pit_type pit2 = pit_;
                if (row_.endpos() >= pars_[pit2].size())
                        ++pit2;
@@ -512,18 +444,18 @@ void RowPainter::paintDepthBar()
                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(bv_.buffer()))
+               if (text_.isMainText(pi_.base.bv->buffer()))
                        x += changebarMargin();
 
                int const starty = yo_ - row_.ascent();
                int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
 
-               pain_.line(x, starty, x, starty + h, Color::depthbar);
+               pi_.pain.line(x, starty, x, starty + h, Color::depthbar);
 
                if (i > prev_depth)
-                       pain_.fillRectangle(x, starty, w, 2, Color::depthbar);
+                       pi_.pain.fillRectangle(x, starty, w, 2, Color::depthbar);
                if (i > next_depth)
-                       pain_.fillRectangle(x, starty + h, w, 2, Color::depthbar);
+                       pi_.pain.fillRectangle(x, starty + h, w, 2, Color::depthbar);
        }
 }
 
@@ -544,10 +476,10 @@ int RowPainter::paintAppendixStart(int y)
        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, Color::none, Color::none);
+       pi_.pain.rectText(text_start, y + d, label, pb_font, Color::none, Color::none);
 
-       pain_.line(int(xo_ + 1), y, text_start, y, Color::appendix);
-       pain_.line(text_end, y, int(xo_ + width_ - 2), y, Color::appendix);
+       pi_.pain.line(int(xo_ + 1), y, text_start, y, Color::appendix);
+       pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color::appendix);
 
        return 3 * defaultRowHeight();
 }
@@ -563,21 +495,21 @@ void RowPainter::paintFirst()
        if (parparams.startOfAppendix())
                y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
-       Buffer const & buffer = bv_.buffer();
+       Buffer const & buffer = pi_.base.bv->buffer();
 
-       Layout_ptr const & layout = par_.layout();
+       LayoutPtr const & layout = par_.layout();
 
        if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
                if (pit_ != 0) {
                        if (layout->latextype == LATEX_PARAGRAPH
                                && !par_.getDepth()) {
-                               y_top += buffer.params().getDefSkip().inPixels(bv_);
+                               y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
                        } else {
-                               Layout_ptr const & playout = pars_[pit_ - 1].layout();
+                               LayoutPtr const & playout = pars_[pit_ - 1].layout();
                                if (playout->latextype == LATEX_PARAGRAPH
                                        && !pars_[pit_ - 1].getDepth()) {
                                        // is it right to use defskip here, too? (AS)
-                                       y_top += buffer.params().getDefSkip().inPixels(bv_);
+                                       y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
                                }
                        }
                }
@@ -621,7 +553,7 @@ void RowPainter::paintFirst()
                                                fm.width(str);
                                }
 
-                               pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+                               pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
                        } else {
                                if (is_rtl) {
                                        x = width_ - leftMargin()
@@ -631,7 +563,7 @@ void RowPainter::paintFirst()
                                                - fm.width(str);
                                }
 
-                               pain_.text(int(x), yo_, str, font);
+                               pi_.pain.text(int(x), yo_, str, font);
                        }
                }
 
@@ -668,7 +600,7 @@ void RowPainter::paintFirst()
                        } else if (is_rtl) {
                                x = width_ - leftMargin() -     fm.width(str);
                        }
-                       pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+                       pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
                }
        }
 }
@@ -676,19 +608,19 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-       bool const is_rtl = text_.isRTL(bv_.buffer(), par_);
+       bool const is_rtl = text_.isRTL(pi_.base.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());
+               FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont());
                int const length = fm.maxAscent() / 2;
                Color::color col = par_.isInserted(par_.size()) ? Color::addedtext : Color::deletedtext;
 
-               pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
+               pi_.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,
+               pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
                           Painter::line_solid, Painter::line_thick);
        }
 
@@ -707,9 +639,9 @@ void RowPainter::paintLast()
                        x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
 
                if (endlabel == END_LABEL_BOX)
-                       pain_.rectangle(x, y, size, size, Color::eolmarker);
+                       pi_.pain.rectangle(x, y, size, size, Color::eolmarker);
                else
-                       pain_.fillRectangle(x, y, size, size, Color::eolmarker);
+                       pi_.pain.fillRectangle(x, y, size, size, Color::eolmarker);
                break;
        }
 
@@ -720,7 +652,7 @@ void RowPainter::paintLast()
                double const x = is_rtl ?
                        x_ - fm.width(str)
                        : - text_metrics_.rightMargin(pm_) - row_.width();
-               pain_.text(int(x), yo_, str, font);
+               pi_.pain.text(int(x), yo_, str, font);
                break;
        }
 
@@ -730,6 +662,25 @@ void RowPainter::paintLast()
 }
 
 
+void RowPainter::paintOnlyInsets()
+{
+       pos_type const end = row_.endpos();
+       for (pos_type pos = row_.pos(); pos != end; ++pos) {
+               if (!par_.isInset(pos))
+                       continue;
+
+               // If outer row has changed, nested insets are repaint completely.
+               Inset const * inset = par_.getInset(pos);
+
+               if (x_ > pi_.base.bv->workWidth())
+                       continue;
+
+               x_ = pi_.base.bv->coordCache().getInsets().x(inset);
+               paintInset(inset, pos);
+       }
+}
+
+
 void RowPainter::paintText()
 {
        pos_type const end = row_.endpos();
@@ -745,7 +696,7 @@ void RowPainter::paintText()
                body_pos = 0;
        }
 
-       Layout_ptr const & layout = par_.layout();
+       LayoutPtr const & layout = par_.layout();
 
        bool running_strikeout = false;
        bool is_struckout = false;
@@ -754,7 +705,6 @@ void RowPainter::paintText()
        // Use font span to speed things up, see below
        FontSpan font_span;
        Font font;
-       Buffer const & buffer = bv_.buffer();
 
        // If the last logical character is a separator, don't paint it, unless
        // it's in the last row of a paragraph; see skipped_sep_vpos declaration
@@ -762,7 +712,7 @@ void RowPainter::paintText()
                skipped_sep_vpos = bidi_.log2vis(end - 1);
        
        for (pos_type vpos = row_.pos(); vpos < end; ) {
-               if (x_ > bv_.workWidth())
+               if (x_ > pi_.base.bv->workWidth())
                        break;
 
                // Skip the separator at the logical end of the row
@@ -781,7 +731,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(buffer, par_, vpos);
+                       font = text_metrics_.getDisplayFont(pit_, vpos);
                }
 
                const int width_pos = pm_.singleWidth(pos, font);
@@ -800,16 +750,16 @@ void RowPainter::paintText()
                }
 
                bool const highly_editable_inset = par_.isInset(pos)
-                       && isHighlyEditableInset(par_.getInset(pos));
+                       && par_.getInset(pos)->editable() == Inset::HIGHLY_EDITABLE;
 
                // 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)) {
                        // Calculate 1/3 height of the buffer's default font
                        FontMetrics const & fm
-                               = theFontMetrics(bv_.buffer().params().getFont());
+                               = theFontMetrics(pi_.base.bv->buffer().params().getFont());
                        int const middle = yo_ - fm.maxAscent() / 3;
-                       pain_.line(last_strikeout_x, middle, int(x_), middle,
+                       pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
                                Color::deletedtext, Painter::line_solid, Painter::line_thin);
                        running_strikeout = false;
                }
@@ -818,44 +768,31 @@ void RowPainter::paintText()
                        int const lwidth = theFontMetrics(getLabelFont())
                                .width(layout->labelsep);
 
-                       x_ += label_hfill_ + lwidth - width_pos;
+                       x_ += row_.label_hfill + lwidth - width_pos;
                }
 
                if (par_.isHfill(pos)) {
-                       x_ += 1;
-
-                       int const y0 = yo_;
-                       int const y1 = y0 - defaultRowHeight() / 2;
-
-                       pain_.line(int(x_), y1, int(x_), y0, Color::added_space);
-
-                       if (par_.hfillExpansion(row_, pos)) {
-                               int const y2 = (y0 + y1) / 2;
-
-                               if (pos >= body_pos) {
-                                       pain_.line(int(x_), y2, int(x_ + hfill_), y2,
-                                                 Color::added_space,
-                                                 Painter::line_onoffdash);
-                                       x_ += hfill_;
-                               } else {
-                                       pain_.line(int(x_), y2, int(x_ + label_hfill_), y2,
-                                                 Color::added_space,
-                                                 Painter::line_onoffdash);
-                                       x_ += label_hfill_;
-                               }
-                               pain_.line(int(x_), y1, int(x_), y0, Color::added_space);
-                       }
-                       x_ += 2;
+                       paintHfill(pos, body_pos);
                        ++vpos;
+
                } else if (par_.isSeparator(pos)) {
-                       Font orig_font = text_.getFont(bv_.buffer(), par_, pos);
+                       Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
                        double const orig_x = x_;
                        x_ += width_pos;
                        if (pos >= body_pos)
-                               x_ += separator_;
-                       ++vpos;
+                               x_ += row_.separator;
                        paintForeignMark(orig_x, orig_font);
+                       ++vpos;
+
+               } else if (par_.isInset(pos)) {
+                       // If outer row has changed, nested insets are repaint completely.
+                       Inset const * inset = par_.getInset(pos);
+                       pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
+                       paintInset(inset, pos);
+                       ++vpos;
+
                } else {
+                       // paint as many characters as possible.
                        paintFromPos(vpos);
                }
        }
@@ -864,250 +801,12 @@ void RowPainter::paintText()
        if (running_strikeout) {
                // calculate 1/3 height of the buffer's default font
                FontMetrics const & fm
-                       = theFontMetrics(bv_.buffer().params().getFont());
+                       = theFontMetrics(pi_.base.bv->buffer().params().getFont());
                int const middle = yo_ - fm.maxAscent() / 3;
-               pain_.line(last_strikeout_x, middle, int(x_), middle,
+               pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
                        Color::deletedtext, Painter::line_solid, Painter::line_thin);
                running_strikeout = false;
        }
 }
 
-
-bool CursorOnRow(PainterInfo & pi, pit_type const pit,
-       RowList::const_iterator rit, Text const & text)
-{
-       // Is there a cursor on this row (or inside inset on row)
-       Cursor & cur = pi.base.bv->cursor();
-       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->endpos())
-                       return true;
-       }
-       return false;
-}
-
-
-bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
-       RowList::const_iterator rit, Text const & text)
-{
-       // Is there a cursor inside an inset on this row, and is this inset
-       // the only "character" on this row
-       Cursor & cur = pi.base.bv->cursor();
-       if (rit->pos() + 1 != rit->endpos())
-               return false;
-       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())
-                       return d < cur.depth() - 1;
-       }
-       return false;
-}
-
-
-// FIXME: once wide() is obsolete, remove this as well!
-bool inNarrowInset(PainterInfo & pi)
-{
-       // check whether the current inset is nested in a non-wide inset
-       Cursor & cur = pi.base.bv->cursor();
-       Inset const * cur_in = &cur.inset();
-       // check all higher nested insets
-       for (size_type i = 1; i < cur.depth(); ++i) {
-               Inset * const in = &cur[i].inset();
-               if (in == cur_in)
-                       // we reached the level of the current inset, so stop
-                       return false;
-               else if (in) {
-                       if (in->hasFixedWidth())
-                               return true;
-                       InsetText * t =
-                               const_cast<InsetText *>(in->asTextInset());
-                       if (t && !t->wide())
-                               // OK, we are in a non-wide() inset
-                               return true;
-               }
-       }
-       return false;
-}
-
-
-void paintPar
-       (PainterInfo & pi, Text const & text, pit_type pit, int x, int y,
-        bool repaintAll)
-{
-//     lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
-       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 = pm.rows().begin();
-       RowList::const_iterator const re = pm.rows().end();
-
-       Bidi bidi;
-
-       y -= rb->ascent();
-       size_type rowno = 0;
-       for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
-               y += rit->ascent();
-               // Allow setting of refreshInside for nested insets in
-               // this row only
-               bool tmp = refreshInside;
-
-               // Row signature; has row changed since last paint?
-               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);
-               bool inNarrowIns = inNarrowInset(pi);
-
-               // 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.
-               // JSpitzm: We should aim at removing wide() altogether while retaining
-               // typing speed within insets.
-               for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
-                       Inset 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
-                                                  && !inNarrowIns);
-                       }
-               }
-
-               // 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) {
-                       bool const inside = (y + rit->descent() >= 0
-                               && 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, bidi, x, y);
-                       // Clear background of this row
-                       // (if paragraph background was not cleared)
-                       if (!repaintAll &&
-                           (!(in_inset_alone_on_row && leftEdgeFixed && !inNarrowIns)
-                               || 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)
-                                       refreshInside = true;
-                       }
-
-                       // Instrumentation for testing row cache (see also
-                       // 12 lines lower):
-                       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();
-               }
-               y += rit->descent();
-               // Restore, see above
-               refreshInside = tmp;
-       }
-       // Re-enable screen drawing for future use of the painter.
-       pi.pain.setDrawingEnabled(true);
-
-       LYXERR(Debug::PAINTING) << "." << endl;
-}
-
-} // namespace anon
-
-
-void paintText(BufferView & bv,
-              Painter & pain)
-{
-       Buffer const & buffer = bv.buffer();
-       Text & 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?
-       // 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());
-       }
-       if (select) {
-               text.drawSelection(pi, 0, 0);
-       }
-
-       int yy = vi.y1;
-       // draw contents
-       for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
-               refreshInside = repaintAll;
-               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.update_strategy == FullScreenUpdate)
-               pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, Color::bottomarea);
-
-       // and possibly grey out below
-//     lyxerr << "par descent: " << text.getPar(vi.p1).ascent() << endl;
-       if (vi.y2 < bv.workHeight() && vi.update_strategy == FullScreenUpdate)
-               pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, Color::bottomarea);
-}
-
-
-void paintTextInset(Text const & text, PainterInfo & pi, int x, int y)
-{
-//     lyxerr << "  paintTextInset: y: " << y << endl;
-
-       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) {
-               ParagraphMetrics const & pmi
-                       = pi.base.bv->parMetrics(&text, pit);
-               y += pmi.ascent();
-               paintPar(pi, text, pit, x, y, repaintAll);
-               y += pmi.descent();
-       }
-}
-
-
 } // namespace lyx