X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.C;h=f29b51e1d592023d038c0cfeefdc95d62cc2c006;hb=73ed0b5203ffefa9a4c2ad8e8cf54396a6e72a9c;hp=907a3c220e7c5b2cd9d7a4490380e74ad8069059;hpb=5b33310202ad0ff7a5f599834d3f5248a5d83d2f;p=lyx.git diff --git a/src/rowpainter.C b/src/rowpainter.C index 907a3c220e..f29b51e1d5 100644 --- a/src/rowpainter.C +++ b/src/rowpainter.C @@ -25,23 +25,26 @@ #include "LColor.h" #include "lyxrc.h" #include "lyxrow.h" -#include "lyxrow_funcs.h" #include "metricsinfo.h" #include "paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.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" #include "support/textutils.h" -using lyx::pos_type; -using lyx::pit_type; +#include + + +namespace lyx { + +using frontend::Painter; +using frontend::FontMetrics; using std::endl; using std::max; @@ -51,6 +54,10 @@ 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,14 +76,14 @@ public: void paintText(); private: - void paintForeignMark(double orig_x, LyXFont const & font); - 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 paintForeignMark(double orig_x, LyXFont const & font, int desc = 0); + 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; @@ -85,7 +92,7 @@ private: LyXFont const getLabelFont() const; /// bufferview to paint on - BufferView const & bv_; + BufferView & bv_; /// Painter to use Painter & pain_; @@ -122,7 +129,7 @@ RowPainter::RowPainter(PainterInfo & pi, erased_(pi.erased_), xo_(x), yo_(y), width_(text_.width()) { - RowMetrics m = text_.computeRowMetrics(pit, row_); + RowMetrics m = text_.computeRowMetrics(*bv_.buffer(), pit, row_); x_ = m.x + xo_; //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl; @@ -139,13 +146,13 @@ 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(), pit_, row_.pos()); } @@ -154,12 +161,25 @@ void RowPainter::paintInset(pos_type const pos, LyXFont const & font) InsetBase const * inset = par_.getInset(pos); BOOST_ASSERT(inset); PainterInfo pi(const_cast(&bv_), pain_); - pi.base.font = font; + // FIXME: We should always use font, see documentation of + // noFontChange() in insetbase.h. + pi.base.font = inset->noFontChange() ? + bv_.buffer()->params().getFont() : + font; pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0); - pi.erased_ = erased_ || isDeletedText(par_, pos); - theCoords.insets().add(inset, int(x_), yo_); - inset->drawSelection(pi, int(x_), yo_); + pi.erased_ = erased_ || par_.isDeleted(pos); + 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(); } @@ -168,22 +188,27 @@ 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)) { + if (!Encodings::isComposeChar_hebrew(c)) { + if (isPrintableNonspace(c)) { int const width2 = - text_.singleWidth(par_, i, c, text_.getFont(par_, i)); + text_.singleWidth(*bv_.buffer(), 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 @@ -194,6 +219,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font) } // Draw nikud + // FIXME UNICODE pain_.text(int(x_) + dx, yo_, str, font); } @@ -201,23 +227,24 @@ 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(*bv_.buffer(), par_, i, c, + text_.getFont(*bv_.buffer(), par_, i)); dx = (width2 - width) / 2; } break; @@ -227,20 +254,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 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); } @@ -250,39 +279,41 @@ 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); + } } -void RowPainter::paintForeignMark(double orig_x, LyXFont const & font) +void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc) { if (!lyxrc.mark_foreign_language) return; @@ -291,7 +322,7 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & font) if (font.language() == bv_.buffer()->params().language) return; - int const y = yo_ + 1; + int const y = yo_ + 1 + desc; pain_.line(int(orig_x), y, int(x_), y, LColor::language); } @@ -299,20 +330,20 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & font) void RowPainter::paintFromPos(pos_type & vpos) { pos_type const pos = text_.bidi.vis2log(vpos); - LyXFont orig_font = text_.getFont(par_, pos); - text_.applyOuterFont(orig_font); + LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos); double const orig_x = x_; if (par_.isInset(pos)) { paintInset(pos, orig_font); ++vpos; - paintForeignMark(orig_x, orig_font); + paintForeignMark(orig_x, orig_font, + par_.getInset(pos)->descent()); return; } // usual characters, no insets - char const c = par_.getChar(pos); + char_type const c = par_.getChar(pos); // special case languages std::string const & lang = orig_font.language()->lang(); @@ -323,8 +354,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); @@ -341,14 +372,14 @@ void RowPainter::paintChangeBar() pos_type const start = row_.pos(); pos_type const end = row_.endpos(); - if (start == end || !par_.isChanged(start, end - 1)) + if (start == end || !par_.isChanged(start, end)) return; int const height = text_.isLastRow(pit_, row_) ? row_.ascent() : row_.height(); - pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar); + pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, LColor::changebar); } @@ -369,12 +400,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) @@ -382,7 +413,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()) @@ -390,11 +421,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(); @@ -416,11 +447,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; @@ -464,7 +496,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; @@ -475,7 +507,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_; @@ -490,24 +524,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); @@ -522,27 +558,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) { - x = ((is_rtl ? leftMargin() : x_) - + width_ - text_.rightMargin(par_)) / 2; - x -= font_metrics::width(str, font) / 2; + if (is_rtl) + x = leftMargin(); + x += (width_ - text_.rightMargin(buffer, par_) - 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); } @@ -552,7 +591,7 @@ 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()); // draw an endlabel @@ -560,7 +599,8 @@ void RowPainter::paintLast() 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; @@ -576,10 +616,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_.rightMargin(*bv_.buffer(), par_) - row_.width(); pain_.text(int(x), yo_, str, font); break; } @@ -605,9 +646,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()) @@ -623,11 +665,11 @@ 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 = - text_.singleWidth(par_, pos, par_.getChar(pos), font); + const int width_pos = text_.singleWidth(buffer, par_, pos, + par_.getChar(pos), font); if (x_ + width_pos < 0) { x_ += width_pos; @@ -635,7 +677,7 @@ void RowPainter::paintText() continue; } - is_struckout = isDeletedText(par_, pos); + is_struckout = par_.isDeleted(pos); if (is_struckout && !running_strikeout) { running_strikeout = true; @@ -649,16 +691,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(text_.defaultfont_) / 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; } @@ -671,7 +715,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) { @@ -702,8 +746,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(text_.defaultfont_) / 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; @@ -711,88 +756,209 @@ void RowPainter::paintText() } +size_type calculateRowSignature(Row const & row, Paragraph const & par, + int x, int y) +{ + boost::crc_32_type crc; + for (pos_type i = row.pos(); i < row.endpos(); ++i) { + char_type const b[] = { par.getChar(i) }; + crc.process_bytes(b, 1); + } + char_type const b[] = { x, y, row.width() }; + crc.process_bytes(b, 3); + return crc.checksum(); +} + + +bool CursorOnRow(PainterInfo & pi, pit_type const pit, + RowList::const_iterator rit, LyXText const & text) +{ + // Is there a cursor on this row (or inside inset on row) + LCursor & 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, LyXText const & text) +{ + // Is there a cursor inside an inset on this row, and is this inset + // the only "character" on this row + LCursor & cur = pi.base.bv->cursor(); + if (rit->pos() + 1 != rit->endpos()) + return false; + for (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; +} + + void paintPar - (PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y) + (PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y, + bool repaintAll) { // lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl; - static NullPainter nop; - static PainterInfo nullpi(pi.base.bv, nop); int const ww = pi.base.bv->workHeight(); + pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y); + Paragraph const & par = text.paragraphs()[pit]; + if (par.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); y -= rb->ascent(); - for (RowList::const_iterator rit = rb; rit != re; ++rit) { + size_type rowno = 0; + for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) { y += rit->ascent(); - bool const inside = (y + rit->descent() >= 0 - && y - rit->ascent() < ww); - RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y); + // Allow setting of refreshInside for nested insets in + // this row only + bool tmp = refreshInside; + + // Row signature; has row changed since last paint? + size_type const row_sig = calculateRowSignature(*rit, par, x, y); + bool row_has_changed = par.rowSignature()[rowno] != row_sig; + + bool cursor_on_row = CursorOnRow(pi, pit, rit, text); + bool in_inset_alone_on_row = innerCursorOnRow(pi, pit, rit, + text); + + // If this is the only object on the row, we can make it wide + for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) { + InsetBase const * const in = par.getInset(i); + if (in) { + InsetText const * const t = in->asTextInset(); + if (t) + t->Wide() = in_inset_alone_on_row; + } + } + + // If 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); + // 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(x, y - rit->ascent(), + text.maxwidth_, rit->height(), + text.backgroundColor()); + // If outer row has changed, force nested + // insets to repaint completely + if (row_has_changed) + refreshInside = true; + } + // Instrumentation for testing row cache (see also + // 12 lines lower): + if (text.isMainText(*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(); + if (rit + 1 == re) + rp.paintLast(); + rp.paintText(); + } y += rit->descent(); - rp.paintAppendix(); - rp.paintDepthBar(); - rp.paintChangeBar(); - if (rit == rb) - rp.paintFirst(); - if (rit + 1 == re) - rp.paintLast(); - rp.paintText(); + // 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 const & bv, ViewMetricsInfo const & vi) +void paintText(BufferView & bv, + Painter & pain) { - Painter & pain = bv.painter(); - LyXText * const text = bv.text(); - - // clear background - pain.fillRectangle(0, vi.y1, bv.workWidth(), vi.y2 - vi.y1, - LColor::background); - - // draw selection + 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(&bv), pain); + // Should the whole screen, including insets, be refreshed? + bool repaintAll = select || !vi.singlepar; - text->drawSelection(pi, 0, 0); + 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) { - yy += text->getPar(pit).ascent(); - paintPar(pi, *bv.text(), pit, 0, yy); - yy += text->getPar(pit).descent(); + refreshInside = repaintAll; + Paragraph const & par = text.getPar(pit); + yy += par.ascent(); + paintPar(pi, text, pit, 0, yy, repaintAll); + yy += par.descent(); } - - // paint one paragraph above and one below + // 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); - paintPar(pi, *bv.text(), vi.p1 - 1, 0, - vi.y1 - text->getPar(vi.p1 - 1).descent()); + text.redoParagraph(bv, vi.p1 - 1); + bv.coordCache().parPos()[&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); - paintPar(pi, *bv.text(), vi.p2 + 1, 0, - vi.y2 + text->getPar(vi.p2 + 1).ascent()); + if (vi.p2 < pit_type(text.paragraphs().size()) - 1) { + text.redoParagraph(bv, vi.p2 + 1); + bv.coordCache().parPos()[&text][vi.p2 + 1] = + Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent()); } // and grey out above (should not happen later) -// lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl; - if (vi.y1 > 0) +// lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl; + if (vi.y1 > 0 && !vi.singlepar) pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea); // and possibly grey out below -// lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl; - if (vi.y2 < bv.workHeight()) +// lyxerr << "par descent: " << text.getPar(vi.p1).ascent() << endl; + if (vi.y2 < bv.workHeight() && !vi.singlepar) pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea); } @@ -802,9 +968,14 @@ 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 = refreshInside; for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) { y += text.getPar(pit).ascent(); - paintPar(pi, text, pit, x, y); + paintPar(pi, text, pit, x, y, repaintAll); y += text.getPar(pit).descent(); } } + + +} // namespace lyx