X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=88ffa6f874bef6aa8f9badab41a9615235081d01;hb=cd4ae51f7787046e8852abc4b339b5191c6adc16;hp=1f0c62b725b86230d9cc88622e6f4042d1e6195b;hpb=91f3b21e42c7b3b2028ec8f66460440e9ddadcbf;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 1f0c62b725..88ffa6f874 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -39,13 +39,16 @@ #include "insets/InsetText.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" +#include "frontends/NullPainter.h" +#include "support/convert.h" #include "support/debug.h" #include "support/lassert.h" +#include "support/lyxlib.h" #include #include @@ -59,6 +62,10 @@ using frontend::FontMetrics; namespace { +// the somewhat arbitrary leading added between rows. This is 20% of +// the characters height, inluding the possible leading of the font. +// 20% is a standard value used by LaTeX and word processors. +double const extra_leading = 0.2; int numberOfLabelHfills(Paragraph const & par, Row const & row) { @@ -97,7 +104,7 @@ int numberOfHfills(Row const & row, ParagraphMetrics const & pm, } -} +} // namespace ///////////////////////////////////////////////////////////////////// // @@ -123,13 +130,6 @@ bool TextMetrics::contains(pit_type pit) const } -ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const -{ - return const_cast(this)->parMetrics(pit, true); -} - - - pair TextMetrics::first() const { ParMetricsCache::const_iterator it = par_metrics_.begin(); @@ -145,6 +145,30 @@ pair TextMetrics::last() const } +bool TextMetrics::isLastRow(Row const & row) const +{ + ParagraphList const & pars = text_->paragraphs(); + return row.endpos() >= pars[row.pit()].size() + && row.pit() + 1 == pit_type(pars.size()); +} + + +bool TextMetrics::isFirstRow(Row const & row) const +{ + return row.pos() == 0 && row.pit() == 0; +} + + +void TextMetrics::setRowChanged(pit_type pit, pos_type pos) +{ + for (auto & pm_pair : par_metrics_) + if (pm_pair.first == pit) + for (Row & row : pm_pair.second.rows()) + if (row.pos() == pos) + row.changed(true); +} + + ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo) { ParMetricsCache::iterator pmc_it = par_metrics_.find(pit); @@ -158,7 +182,44 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo) } -bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) +ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const +{ + return const_cast(this)->parMetrics(pit, true); +} + + +void TextMetrics::newParMetricsDown() +{ + pair const & last = *par_metrics_.rbegin(); + pit_type const pit = last.first + 1; + if (pit == int(text_->paragraphs().size())) + return; + + // do it and update its position. + redoParagraph(pit); + par_metrics_[pit].setPosition(last.second.position() + + last.second.descent() + par_metrics_[pit].ascent()); + updatePosCache(pit); +} + + +void TextMetrics::newParMetricsUp() +{ + pair const & first = *par_metrics_.begin(); + if (first.first == 0) + return; + + pit_type const pit = first.first - 1; + // do it and update its position. + redoParagraph(pit); + par_metrics_[pit].setPosition(first.second.position() + - first.second.ascent() - par_metrics_[pit].descent()); + updatePosCache(pit); +} + + +bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width, + bool const expand_on_multipars) { LBUFERR(mi.base.textwidth > 0); max_width_ = mi.base.textwidth; @@ -168,7 +229,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) dim_ = Dimension(); dim_.wid = min_width; pit_type const npar = text_->paragraphs().size(); - if (npar > 1) + if (npar > 1 && expand_on_multipars) // If there is more than one row, expand the text to // the full allowable width. dim_.wid = max_width_; @@ -179,13 +240,21 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) bool changed = false; unsigned int h = 0; for (pit_type pit = 0; pit != npar; ++pit) { - changed |= redoParagraph(pit); + // create rows, but do not set alignment yet + changed |= redoParagraph(pit, false); ParagraphMetrics const & pm = par_metrics_[pit]; h += pm.height(); if (dim_.wid < pm.width()) dim_.wid = pm.width(); } + // Now set alignment for all rows (the width might not have been known before). + for (pit_type pit = 0; pit != npar; ++pit) { + ParagraphMetrics & pm = par_metrics_[pit]; + for (Row & row : pm.rows()) + setRowAlignment(row, dim_.wid); + } + dim_.asc = par_metrics_[0].ascent(); dim_.des = h - dim_.asc; //lyxerr << "dim_.wid " << dim_.wid << endl; @@ -198,6 +267,14 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) } +void TextMetrics::updatePosCache(pit_type pit) const +{ + frontend::NullPainter np; + PainterInfo pi(bv_, np); + drawParagraph(pi, pit, origin_.x_, par_metrics_[pit].position()); +} + + int TextMetrics::rightMargin(ParagraphMetrics const & pm) const { return text_->isMainText() ? pm.rightMargin(*bv_) : 0; @@ -343,7 +420,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, } -bool TextMetrics::redoParagraph(pit_type const pit) +bool TextMetrics::redoParagraph(pit_type const pit, bool const align_rows) { Paragraph & par = text_->getPar(pit); // IMPORTANT NOTE: We pass 'false' explicitly in order to not call @@ -404,19 +481,17 @@ bool TextMetrics::redoParagraph(pit_type const pit) par.setBeginOfBody(); Font const bufferfont = buffer.params().getFont(); CoordCache::Insets & insetCache = bv_->coordCache().insets(); - InsetList::const_iterator ii = par.insetList().begin(); - InsetList::const_iterator iend = par.insetList().end(); - for (; ii != iend; ++ii) { + for (auto const & e : par.insetList()) { // FIXME Doesn't this HAVE to be non-empty? // position already initialized? if (!parPos.empty()) { - parPos.pos() = ii->pos; + parPos.pos() = e.pos; // A macro template would normally not be visible // by itself. But the tex macro semantics allow // recursion, so we artifically take the context // after the macro template to simulate this. - if (ii->inset->lyxCode() == MATHMACRO_CODE) + if (e.inset->lyxCode() == MATHMACRO_CODE) parPos.pos()++; } @@ -424,7 +499,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) // substracted to the available width. The logic here is // almost the same as in breakRow, remember keep them in sync. int eop = 0; - if (lyxrc.paragraph_markers && ii->pos + 1 == par.size() + if (lyxrc.paragraph_markers && e.pos + 1 == par.size() && size_type(pit + 1) < text_->paragraphs().size()) { Font f(text_->layoutFont(pit)); // ¶ U+00B6 PILCROW SIGN @@ -433,15 +508,15 @@ bool TextMetrics::redoParagraph(pit_type const pit) // do the metric calculation Dimension dim; - int const w = max_width_ - leftMargin(max_width_, pit, ii->pos) + int const w = max_width_ - leftMargin(pit, e.pos) - right_margin - eop; - Font const & font = ii->inset->inheritFont() ? - displayFont(pit, ii->pos) : bufferfont; + Font const & font = e.inset->inheritFont() ? + displayFont(pit, e.pos) : bufferfont; MacroContext mc(&buffer, parPos); MetricsInfo mi(bv_, font.fontInfo(), w, mc); - ii->inset->metrics(mi, dim); - if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) { - insetCache.add(ii->inset, dim); + e.inset->metrics(mi, dim); + if (!insetCache.has(e.inset) || insetCache.dim(e.inset) != dim) { + insetCache.add(e.inset, dim); changed = true; } } @@ -459,23 +534,20 @@ bool TextMetrics::redoParagraph(pit_type const pit) row.pit(pit); need_new_row = breakRow(row, right_margin); setRowHeight(row); - row.setChanged(false); - if (row_index || row.endpos() < par.size() - || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) { + row.changed(true); + if ((row_index || row.endpos() < par.size() || row.right_boundary()) + && par.inInset().lyxCode() != CELL_CODE) { /* If there is more than one row or the row has been * broken by a display inset or a newline, expand the text * to the full allowable width. This setting here is - * needed for the computeRowMetrics() below. In the case - * of a display inset, we do nothing when inside a table - * cell, because the tabular code is not prepared for - * that, and it triggers when using a caption in a - * longtable (see bugs #9945 and #9757). + * needed for the setRowAlignment() below. + * We do nothing when inside a table cell. */ if (dim_.wid < max_width_) dim_.wid = max_width_; } - int const max_row_width = max(dim_.wid, row.width()); - computeRowMetrics(row, max_row_width); + if (align_rows) + setRowAlignment(row, max(dim_.wid, row.width())); first = row.endpos(); ++row_index; @@ -491,9 +563,9 @@ bool TextMetrics::redoParagraph(pit_type const pit) // Top and bottom margin of the document (only at top-level) if (text_->isMainText()) { // original value was 20px, which is 0.2in at 100dpi - int const margin = Length(0.2, Length::IN).inPixels(0); + int const margin = bv_->zoomedPixels(20); if (pit == 0) { - pm.rows().front().dimension().asc += margin; + pm.rows().front().dim().asc += margin; /* coverity thinks that we should update pm.dim().asc * below, but all the rows heights are actually counted as * part of the paragraph metric descent see loop above). @@ -503,16 +575,16 @@ bool TextMetrics::redoParagraph(pit_type const pit) } ParagraphList const & pars = text_->paragraphs(); if (pit + 1 == pit_type(pars.size())) { - pm.rows().back().dimension().des += margin; + pm.rows().back().dim().des += margin; pm.dim().des += margin; } } // The space above and below the paragraph. int const top = parTopSpacing(pit); - pm.rows().front().dimension().asc += top; + pm.rows().front().dim().asc += top; int const bottom = parBottomSpacing(pit); - pm.rows().back().dimension().des += bottom; + pm.rows().back().dim().des += bottom; pm.dim().des += top + bottom; pm.dim().asc += pm.rows()[0].ascent(); @@ -582,7 +654,7 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const } -void TextMetrics::computeRowMetrics(Row & row, int width) const +void TextMetrics::setRowAlignment(Row & row, int width) const { row.label_hfill = 0; row.separator = 0; @@ -635,26 +707,28 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const if (!row.setExtraWidth(w) && row.isRTL()) { // Justification failed and the text is RTL: align to the right row.left_margin += w; - row.dimension().wid += w; + row.dim().wid += w; } break; case LYX_ALIGN_LEFT: // a displayed inset that is flushed - if (Inset const * inset = par.getInset(row.pos())) + if (Inset const * inset = par.getInset(row.pos())) { row.left_margin += inset->indent(*bv_); + row.dim().wid += inset->indent(*bv_); + } break; case LYX_ALIGN_RIGHT: if (Inset const * inset = par.getInset(row.pos())) { int const new_w = max(w - inset->indent(*bv_), 0); row.left_margin += new_w; - row.dimension().wid += new_w; + row.dim().wid += new_w; } else { row.left_margin += w; - row.dimension().wid += w; + row.dim().wid += w; } break; case LYX_ALIGN_CENTER: - row.dimension().wid += w / 2; + row.dim().wid += w / 2; row.left_margin += w / 2; break; case LYX_ALIGN_NONE: @@ -669,7 +743,7 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const // Case nh > 0. There are hfill separators. hfill = w / nh; hfill_rem = w % nh; - row.dimension().wid += w; + row.dim().wid += w; // Set size of hfill insets pos_type const endpos = row.endpos(); pos_type body_pos = par.beginOfBody(); @@ -678,22 +752,20 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const body_pos = 0; CoordCache::Insets & insetCache = bv_->coordCache().insets(); - Row::iterator cit = row.begin(); - Row::iterator const cend = row.end(); - for ( ; cit != cend; ++cit) { - if (row.label_hfill && cit->endpos == body_pos - && cit->type == Row::SPACE) - cit->dim.wid -= int(row.label_hfill * (nlh - 1)); - if (cit->inset && pm.hfillExpansion(row, cit->pos)) { - if (cit->pos >= body_pos) { - cit->dim.wid += hfill; + for (Row::Element & e : row) { + if (row.label_hfill && e.endpos == body_pos + && e.type == Row::SPACE) + e.dim.wid -= int(row.label_hfill * (nlh - 1)); + if (e.inset && pm.hfillExpansion(row, e.pos)) { + if (e.pos >= body_pos) { + e.dim.wid += hfill; --nh; if (nh == 0) - cit->dim.wid += hfill_rem; + e.dim.wid += hfill_rem; } else - cit->dim.wid += int(row.label_hfill); + e.dim.wid += int(row.label_hfill); // Cache the inset dimension. - insetCache.add(cit->inset, cit->dim); + insetCache.add(e.inset, e.dim); } } } @@ -705,13 +777,12 @@ int TextMetrics::labelFill(Row const & row) const LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0)); int w = 0; - Row::const_iterator cit = row.begin(); - Row::const_iterator const end = row.end(); // iterate over elements before main body (except the last one, // which is extra space). - while (cit!= end && cit->endpos < par.beginOfBody()) { - w += cit->dim.wid; - ++cit; + for (Row::Element const & e : row) { + if (e.endpos >= par.beginOfBody()) + break; + w += e.dim.wid; } docstring const & label = par.params().labelWidthString(); @@ -747,7 +818,7 @@ int TextMetrics::labelEnd(pit_type const pit) const if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL) return 0; // return the beginning of the body - return leftMargin(max_width_, pit); + return leftMargin(pit); } namespace { @@ -806,7 +877,7 @@ private: pos_type bodypos_; }; -} // anon namespace +} // namespace /** This is the function where the hard work is done. The code here is * very sensitive to small changes :) Note that part of the @@ -822,21 +893,16 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const bool need_new_row = false; row.clear(); - row.left_margin = leftMargin(max_width_, row.pit(), pos); + row.left_margin = leftMargin(row.pit(), pos); row.right_margin = right_margin; if (is_rtl) swap(row.left_margin, row.right_margin); // Remember that the row width takes into account the left_margin // but not the right_margin. - row.dimension().wid = row.left_margin; + row.dim().wid = row.left_margin; // the width available for the row. int const width = max_width_ - row.right_margin; - if (pos >= end || row.width() > width) { - row.endpos(end); - return need_new_row; - } - #if 0 //FIXME: As long as leftMargin() is not correctly implemented for // MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here. @@ -855,10 +921,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const // or the end of the par, then build a representation of the row. pos_type i = pos; FontIterator fi = FontIterator(*this, par, row.pit(), pos); - do { - // this can happen for an empty row after a newline - if (i >= end) - break; + while (i < end && (i == pos || row.width() <= width)) { char_type c = par.getChar(i); // The most special cases are handled first. if (par.isInset(i)) { @@ -895,17 +958,8 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const // ¶ U+00B6 PILCROW SIGN char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6; row.add(i, screen_char, *fi, par.lookupChange(i)); - } else { - // FIXME: please someone fix the Hebrew/Arabic parenthesis mess! - // see also Paragraph::getUChar. - if (fi->language()->lang() == "hebrew") { - if (c == '(') - c = ')'; - else if (c == ')') - c = '('; - } + } else row.add(i, c, *fi, par.lookupChange(i)); - } // add inline completion width // draw logically behind the previous character @@ -940,7 +994,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const ++i; ++fi; - } while (i < end && row.width() <= width); + } row.finalizeLast(); row.endpos(i); @@ -961,12 +1015,17 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change()); } + // Is there a end-of-paragaph change? + if (i == end && par.lookupChange(end).changed() && !need_new_row) + row.needsChangeBar(true); + // if the row is too large, try to cut at last separator. In case // of success, reset indication that the row was broken abruptly. - int const next_width = max_width_ - leftMargin(max_width_, row.pit(), row.endpos()) + int const next_width = max_width_ - leftMargin(row.pit(), row.endpos()) - rightMargin(row.pit()); - row.shortenIfNeeded(body_pos, width, next_width); + if (row.shortenIfNeeded(body_pos, width, next_width)) + row.flushed(false); row.right_boundary(!row.empty() && row.endpos() < end && row.back().endpos == row.endpos()); // Last row in paragraph is flushed @@ -1037,8 +1096,8 @@ int TextMetrics::parTopSpacing(pit_type const pit) const if (prev != pit_type(pars.size())) { asc += int(pars[prev].layout().parsep * dh); } else if (pit != 0) { - Paragraph const & prevpar = pars[pit - 1]; - if (prevpar.getDepth() != 0 || prevpar.layout() == layout) + Paragraph const & prevpar2 = pars[pit - 1]; + if (prevpar2.getDepth() != 0 || prevpar2.layout() == layout) asc += int(layout.parsep * dh); } @@ -1087,29 +1146,19 @@ void TextMetrics::setRowHeight(Row & row) const // Initial value for ascent (useful if row is empty). Font const font = displayFont(row.pit(), row.pos()); FontMetrics const & fm = theFontMetrics(font); - int maxasc = int(fm.maxAscent() * spacing_val); - int maxdes = int(fm.maxDescent() * spacing_val); + int maxasc = fm.maxAscent() + fm.leading(); + int maxdes = fm.maxDescent(); // Find the ascent/descent of the row contents - Row::const_iterator cit = row.begin(); - Row::const_iterator cend = row.end(); - for ( ; cit != cend; ++cit) { - if (cit->inset) { - maxasc = max(maxasc, cit->dim.ascent()); - maxdes = max(maxdes, cit->dim.descent()); - } else { - FontMetrics const & fm = theFontMetrics(cit->font); - maxasc = max(maxasc, int(fm.maxAscent() * spacing_val)); - maxdes = max(maxdes, int(fm.maxDescent() * spacing_val)); - } + for (Row::Element const & e : row) { + maxasc = max(maxasc, e.dim.ascent()); + maxdes = max(maxdes, e.dim.descent()); } - // This is nicer with box insets - ++maxasc; - ++maxdes; - - row.dimension().asc = maxasc; - row.dimension().des = maxdes; + // Add some leading (split between before and after) + int const leading = support::iround(extra_leading * (maxasc + maxdes)); + row.dim().asc = int((maxasc + leading - leading / 2) * spacing_val); + row.dim().des = int((maxdes + leading / 2) * spacing_val); } @@ -1208,33 +1257,6 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const } -void TextMetrics::newParMetricsDown() -{ - pair const & last = *par_metrics_.rbegin(); - pit_type const pit = last.first + 1; - if (pit == int(text_->paragraphs().size())) - return; - - // do it and update its position. - redoParagraph(pit); - par_metrics_[pit].setPosition(last.second.position() - + last.second.descent() + par_metrics_[pit].ascent()); -} - - -void TextMetrics::newParMetricsUp() -{ - pair const & first = *par_metrics_.begin(); - if (first.first == 0) - return; - - pit_type const pit = first.first - 1; - // do it and update its position. - redoParagraph(pit); - par_metrics_[pit].setPosition(first.second.position() - - first.second.ascent() - par_metrics_[pit].descent()); -} - // y is screen coordinate pit_type TextMetrics::getPitNearY(int y) { @@ -1284,9 +1306,9 @@ pit_type TextMetrics::getPitNearY(int y) LYXERR(Debug::DEBUG, "examining: pit: " << it->first << " y: " << it->second.position()); - ParagraphMetrics const & pm = par_metrics_[it->first]; + ParagraphMetrics const & pm2 = par_metrics_[it->first]; - if (it->first >= pit && int(it->second.position()) - int(pm.ascent()) <= y) { + if (it->first >= pit && int(it->second.position()) - int(pm2.ascent()) <= y) { pit = it->first; yy = it->second.position(); } @@ -1357,9 +1379,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, cur.pit() = pit; // Do we cover an inset? - InsetList::InsetTable * it = checkInsetHit(pit, x, y); + InsetList::Element * e = checkInsetHit(pit, x, y); - if (!it) { + if (!e) { // No inset, set position in the text bool bound = false; // is modified by getPosNearX cur.pos() = getPosNearX(row, x, bound); @@ -1369,17 +1391,19 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, return 0; } - Inset * inset = it->inset; + Inset * inset = e->inset; //lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl; // Set position in front of inset - cur.pos() = it->pos; + cur.pos() = e->pos; cur.boundary(false); cur.setTargetX(x); // Try to descend recursively inside the inset. Inset * edited = inset->editXY(cur, x, y); - if (edited == inset && cur.pos() == it->pos) { + // FIXME: it is not clear that the test on position is needed + // Remove it if/when semantics of editXY is clarified + if (cur.text() == text_ && cur.pos() == e->pos) { // non-editable inset, set cursor after the inset if x is // nearer to that position (bug 9628) bool bound = false; // is modified by getPosNearX @@ -1433,19 +1457,19 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const //takes screen x,y coordinates -InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y) +InsetList::Element * TextMetrics::checkInsetHit(pit_type pit, int x, int y) { Paragraph const & par = text_->paragraphs()[pit]; CoordCache::Insets const & insetCache = bv_->coordCache().getInsets(); LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit); - for (auto const & it : par.insetList()) { - LYXERR(Debug::DEBUG, "examining inset " << it.inset); + for (InsetList::Element const & e : par.insetList()) { + LYXERR(Debug::DEBUG, "examining inset " << e.inset); - if (insetCache.covers(it.inset, x, y)) { - LYXERR(Debug::DEBUG, "Hit inset: " << it.inset); - return const_cast(&it); + if (insetCache.covers(e.inset, x, y)) { + LYXERR(Debug::DEBUG, "Hit inset: " << e.inset); + return const_cast(&e); } } @@ -1459,12 +1483,12 @@ Inset * TextMetrics::checkInsetHit(int x, int y) { pit_type const pit = getPitNearY(y); LASSERT(pit != -1, return 0); - InsetList::InsetTable * it = checkInsetHit(pit, x, y); + InsetList::Element * e = checkInsetHit(pit, x, y); - if (!it) + if (!e) return 0; - return it->inset; + return e->inset; } @@ -1489,14 +1513,14 @@ int TextMetrics::cursorX(CursorSlice const & sl, int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const { //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl; - ParagraphMetrics const & pm = par_metrics_[sl.pit()]; + ParagraphMetrics const & pm = parMetrics(sl.pit()); if (pm.rows().empty()) return 0; int h = 0; - h -= par_metrics_[0].rows()[0].ascent(); + h -= parMetrics(0).rows()[0].ascent(); for (pit_type pit = 0; pit < sl.pit(); ++pit) { - h += par_metrics_[pit].height(); + h += parMetrics(pit).height(); } int pos = sl.pos(); if (pos && boundary) @@ -1560,34 +1584,19 @@ void TextMetrics::deleteLineForward(Cursor & cur) if (!cur.selection()) text_->deleteWordForward(cur); else - cap::cutSelection(cur, true, false); + cap::cutSelection(cur, false); cur.checkBufferStructure(); } } -bool TextMetrics::isLastRow(Row const & row) const -{ - ParagraphList const & pars = text_->paragraphs(); - return row.endpos() >= pars[row.pit()].size() - && row.pit() + 1 == pit_type(pars.size()); -} - - -bool TextMetrics::isFirstRow(Row const & row) const +int TextMetrics::leftMargin(pit_type pit) const { - return row.pos() == 0 && row.pit() == 0; + return leftMargin(pit, text_->paragraphs()[pit].size()); } -int TextMetrics::leftMargin(int max_width, pit_type pit) const -{ - return leftMargin(max_width, pit, text_->paragraphs()[pit].size()); -} - - -int TextMetrics::leftMargin(int max_width, - pit_type const pit, pos_type const pos) const +int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const { ParagraphList const & pars = text_->paragraphs(); @@ -1606,10 +1615,10 @@ int TextMetrics::leftMargin(int max_width, int l_margin = 0; - if (text_->isMainText()) + if (text_->isMainText()) { l_margin += bv_->leftMargin(); - - l_margin += bfm.signedWidth(tclass.leftmargin()); + l_margin += bfm.signedWidth(tclass.leftmargin()); + } int depth = par.getDepth(); if (depth != 0) { @@ -1620,7 +1629,7 @@ int TextMetrics::leftMargin(int max_width, int nestmargin = depth * nestMargin(); if (text_->isMainText()) nestmargin += changebarMargin(); - l_margin = max(leftMargin(max_width, newpar), nestmargin); + l_margin = max(leftMargin(newpar), nestmargin); // Remove the parindent that has been added // if the paragraph was empty. if (pars[newpar].empty() && @@ -1717,23 +1726,21 @@ int TextMetrics::leftMargin(int max_width, // same time this function is used in redoParagraph to construct // the rows. ParagraphMetrics const & pm = par_metrics_[pit]; - RowList::const_iterator rit = pm.rows().begin(); - RowList::const_iterator end = pm.rows().end(); - int minfill = max_width; - for ( ; rit != end; ++rit) - if (rit->fill() < minfill) - minfill = rit->fill(); + int minfill = max_width_; + for (row : pm.rows()) + if (row.fill() < minfill) + minfill = row.fill(); l_margin += bfm.signedWidth(layout.leftmargin); l_margin += minfill; #endif // also wrong, but much shorter. - l_margin += max_width / 2; + l_margin += max_width_ / 2; break; } } if (!par.params().leftIndent().zero()) - l_margin += par.params().leftIndent().inPixels(max_width, lfm.em()); + l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em()); LyXAlignment align = par.getAlign(); @@ -1779,17 +1786,15 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const origin_.x_ = x; origin_.y_ = y; - ParMetricsCache::iterator it = par_metrics_.begin(); - ParMetricsCache::iterator const pm_end = par_metrics_.end(); - y -= it->second.ascent(); - for (; it != pm_end; ++it) { - ParagraphMetrics const & pmi = it->second; - y += pmi.ascent(); - pit_type const pit = it->first; + y -= par_metrics_.begin()->second.ascent(); + for (auto & pm_pair : par_metrics_) { + pit_type const pit = pm_pair.first; + ParagraphMetrics & pm = pm_pair.second; + y += pm.ascent(); // Save the paragraph position in the cache. - it->second.setPosition(y); + pm.setPosition(y); drawParagraph(pi, pit, x, y); - y += pmi.descent(); + y += pm.descent(); } } @@ -1801,8 +1806,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const return; size_t const nrows = pm.rows().size(); - // Use fast lane when drawing is disabled. - if (!pi.pain.isDrawingEnabled()) { + // Use fast lane in nodraw stage. + if (pi.pain.isNull()) { for (size_t i = 0; i != nrows; ++i) { Row const & row = pm.rows()[i]; @@ -1854,17 +1859,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const if (i) y += row.ascent(); - RowPainter rp(pi, *text_, row, row_x, y); - // It is not needed to draw on screen if we are not inside. bool const inside = (y + row.descent() >= 0 && y - row.ascent() < ww); - pi.pain.setDrawingEnabled(inside); if (!inside) { - // Paint only the insets to set inset cache correctly - // FIXME: remove paintOnlyInsets when we know that positions - // have already been set. - rp.paintOnlyInsets(); + // Inset positions have already been set in nodraw stage. y += row.descent(); continue; } @@ -1872,58 +1871,63 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const if (selection) row.setSelectionAndMargins(sel_beg_par, sel_end_par); else - row.setSelection(-1, -1); + row.clearSelectionAndMargins(); // The row knows nothing about the paragraph, so we have to check // whether this row is the first or last and update the margins. if (row.selection()) { if (row.sel_beg == 0) - row.begin_margin_sel = sel_beg.pit() < pit; + row.change(row.begin_margin_sel, sel_beg.pit() < pit); if (row.sel_end == sel_end_par.lastpos()) - row.end_margin_sel = sel_end.pit() > pit; + row.change(row.end_margin_sel, sel_end.pit() > pit); } - // Row signature; has row changed since last paint? - row.setCrc(pm.computeRowSignature(row, *bv_)); - bool row_has_changed = row.changed() - || bv_->hadHorizScrollOffset(text_, pit, row.pos()); - // Take this opportunity to spellcheck the row contents. - if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) { + if (row.changed() && pi.do_spellcheck && lyxrc.spellcheck_continuously) { text_->getPar(pit).spellCheck(); } + RowPainter rp(pi, *text_, row, row_x, y); + // Don't paint the row if a full repaint has not been requested // and if it has not changed. - if (!pi.full_repaint && !row_has_changed) { + if (!pi.full_repaint && !row.changed()) { // Paint only the insets if the text itself is // unchanged. rp.paintOnlyInsets(); + row.changed(false); y += row.descent(); continue; } // Clear background of this row if paragraph background was not // already cleared because of a full repaint. - if (!pi.full_repaint && row_has_changed) { + if (!pi.full_repaint && row.changed()) { LYXERR(Debug::PAINTING, "Clear rect@(" << max(row_x, 0) << ", " << y - row.ascent() << ")=" << width() << " x " << row.height()); - pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(), - width(), row.height(), pi.background_color); + // FIXME: this is a hack. We know that at least this + // amount of pixels can be cleared on right and left. + // Doing so gets rid of caret ghosts when the cursor is at + // the begining/end of row. However, it will not work if + // the caret has a ridiculous width like 6. (see ticket + // #10797) + pi.pain.fillRectangle(max(row_x, 0) - Inset::TEXT_TO_INSET_OFFSET, + y - row.ascent(), + width() + 2 * Inset::TEXT_TO_INSET_OFFSET, + row.height(), pi.background_color); } // Instrumentation for testing row cache (see also // 12 lines lower): if (lyxerr.debugging(Debug::PAINTING) - && (row.selection() || pi.full_repaint || row_has_changed)) { - string const foreword = text_->isMainText() ? - "main text redraw " : "inset text redraw: "; - LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i - << " row_selection=" << row.selection() - << " full_repaint=" << pi.full_repaint - << " row_has_changed=" << row_has_changed - << " drawingEnabled=" << pi.pain.isDrawingEnabled()); + && (row.selection() || pi.full_repaint || row.changed())) { + string const foreword = text_->isMainText() ? "main text redraw " + : "inset text redraw: "; + LYXERR0(foreword << "pit=" << pit << " row=" << i + << (row.selection() ? " row_selection": "") + << (pi.full_repaint ? " full_repaint" : "") + << (row.changed() ? " row.changed" : "")); } // Backup full_repaint status and force full repaint @@ -1934,25 +1938,36 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); - rp.paintChangeBar(); - if (i == 0 && !row.isRTL()) + if (row.needsChangeBar()) + rp.paintChangeBar(); + if (i == 0) rp.paintFirst(); - if (i == nrows - 1 && row.isRTL()) + if (i == nrows - 1) rp.paintLast(); rp.paintText(); - if (i == nrows - 1 && !row.isRTL()) - rp.paintLast(); - if (i == 0 && row.isRTL()) - rp.paintFirst(); rp.paintTooLargeMarks(row_x + row.left_x() < 0, row_x + row.right_x() > bv_->workWidth()); y += row.descent(); +#if 0 + // This debug code shows on screen which rows are repainted. + // FIXME: since the updates related to caret blinking restrict + // the painter to a small rectangle, the numbers are not + // updated when this happens. Change the code in + // GuiWorkArea::Private::show/hideCaret if this is important. + static int count = 0; + ++count; + FontInfo fi(sane_font); + fi.setSize(FONT_SIZE_TINY); + fi.setColor(Color_red); + pi.pain.text(row_x, y, convert(count), fi); +#endif + // Restore full_repaint status. pi.full_repaint = tmp; + + row.changed(false); } - // Re-enable screen drawing for future use of the painter. - pi.pain.setDrawingEnabled(true); //LYXERR(Debug::PAINTING, "."); } @@ -1974,7 +1989,7 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, row.pos(wordStart.pos()); row.endpos(bvcur.pos()); setRowHeight(row); - dim = row.dimension(); + dim = row.dim(); // get position on screen of the word start and end //FIXME: Is it necessary to explicitly set this to false? @@ -1993,7 +2008,8 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, int defaultRowHeight() { - return int(theFontMetrics(sane_font).maxHeight() * 1.2); + FontMetrics const & fm = theFontMetrics(sane_font); + return support::iround(fm.maxHeight() * (1 + extra_leading) + fm.leading()); } } // namespace lyx