X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.C;h=2cb5b6311abefe4f6583f6b4b3edc2924fd5e762;hb=0657a91fd08e9c31d7f9e6be26055cc5050e5f8b;hp=4290ffbf840d20425a5c00509a5b5198223314c7;hpb=7fcc942eecd22ac6527bf33c370d228e43530b19;p=lyx.git diff --git a/src/rowpainter.C b/src/rowpainter.C index 4290ffbf84..2cb5b6311a 100644 --- a/src/rowpainter.C +++ b/src/rowpainter.C @@ -27,8 +27,10 @@ #include "lyxrow.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/FontMetrics.h" @@ -73,6 +75,7 @@ public: void paintFirst(); void paintLast(); void paintText(); + int maxWidth() { return max_width_; } private: void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0); @@ -98,6 +101,7 @@ private: /// LyXText for the row LyXText const & text_; + TextMetrics & text_metrics_; ParagraphList const & pars_; /// The row to paint @@ -106,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_; @@ -123,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(*bv_.buffer(), pit, row_); + RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_); x_ = m.x + xo_; //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl; @@ -151,7 +161,7 @@ LyXFont const RowPainter::getLabelFont() const int RowPainter::leftMargin() const { - return text_.leftMargin(*bv_.buffer(), pit_, row_.pos()); + return text_.leftMargin(*bv_.buffer(), max_width_, pit_, row_.pos()); } @@ -192,8 +202,9 @@ void RowPainter::paintInset(pos_type const pos, LyXFont const & font) x_ += inset->width(); #ifdef DEBUG_METRICS Dimension dim; - BOOST_ASSERT(text_.maxwidth_ > 0); - int const w = text_.maxwidth_ - leftMargin() - text_.rightMargin(*bv_.buffer(), par_); + 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) @@ -620,7 +631,7 @@ void RowPainter::paintFirst() if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) { if (is_rtl) x = leftMargin(); - x += (width_ - text_.rightMargin(buffer, par_) - leftMargin()) / 2; + x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2; x -= fm.width(str) / 2; } else if (is_rtl) { x = width_ - leftMargin() - fm.width(str); @@ -676,7 +687,7 @@ void RowPainter::paintLast() docstring const & str = par_.layout()->endlabelstring(); double const x = is_rtl ? x_ - fm.width(str) - : - text_.rightMargin(*bv_.buffer(), par_) - row_.width(); + : - text_metrics_.rightMargin(pm_) - row_.width(); pain_.text(int(x), yo_, str, font); break; } @@ -812,20 +823,6 @@ 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) { @@ -872,11 +869,12 @@ void paintPar pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y); Paragraph const & par = text.paragraphs()[pit]; - if (par.rows().empty()) + 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(); + RowList::const_iterator const rb = pm.rows().begin(); + RowList::const_iterator const re = pm.rows().end(); y -= rb->ascent(); size_type rowno = 0; @@ -887,12 +885,14 @@ void paintPar 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 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 // @@ -905,7 +905,7 @@ void paintPar if (in) { InsetText * t = const_cast(in->asTextInset()); if (t) - t->setWide(in_inset_alone_on_row); + t->setWide(in_inset_alone_on_row && leftEdgeFixed); } } @@ -913,9 +913,6 @@ void paintPar // 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. @@ -924,9 +921,10 @@ void paintPar // Clear background of this row // (if paragraph background was not cleared) if (!repaintAll && - (!in_inset_alone_on_row || row_has_changed)) { + (!(in_inset_alone_on_row && leftEdgeFixed) + || row_has_changed)) { pi.pain.fillRectangle(x, y - rit->ascent(), - text.maxwidth_, rit->height(), + rp.maxWidth(), rit->height(), text.backgroundColor()); // If outer row has changed, force nested // insets to repaint completely @@ -949,7 +947,7 @@ void paintPar rp.paintChangeBar(); if (rit == rb) rp.paintFirst(); - rp.paintText(); + rp.paintText(); if (rit + 1 == re) rp.paintLast(); } @@ -979,7 +977,10 @@ void paintText(BufferView & bv, PainterInfo pi(const_cast(&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) @@ -994,36 +995,20 @@ void paintText(BufferView & bv, // draw contents for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) { refreshInside = repaintAll; - Paragraph const & par = text.getPar(pit); - yy += par.ascent(); + ParagraphMetrics const & pm = bv.parMetrics(&text, pit); + yy += pm.ascent(); paintPar(pi, 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(bv, vi.p1 - 1); - bv.coordCache().parPos()[&text][vi.p1 - 1] = - Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent()); - } - - 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()); + 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) + 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) + if (vi.y2 < bv.workHeight() && vi.update_strategy != SingleParUpdate) pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea); } @@ -1032,13 +1017,15 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y) { // lyxerr << " paintTextInset: y: " << y << endl; - y -= text.getPar(0).ascent(); + 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(); } }