X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=cacf2e7ea65326ff73312eebe12b97e01d4df631;hb=26d4b5bb473155b44cfdf6aca14b38c2ce2d8469;hp=c10348d0d8ac6462316c7c5e898ca23aca7c9052;hpb=e39e4cf96b23997c065a890c015138eb93a1d4fd;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index c10348d0d8..cacf2e7ea6 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -26,7 +26,6 @@ #include "CoordCache.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "HSpace.h" #include "InsetList.h" #include "Language.h" #include "Layout.h" @@ -40,14 +39,17 @@ #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 #include using namespace std; @@ -97,7 +99,7 @@ int numberOfHfills(Row const & row, ParagraphMetrics const & pm, } -} +} // namespace ///////////////////////////////////////////////////////////////////// // @@ -198,6 +200,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; @@ -401,6 +411,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) } // redo insets + par.setBeginOfBody(); Font const bufferfont = buffer.params().getFont(); CoordCache::Insets & insetCache = bv_->coordCache().insets(); InsetList::const_iterator ii = par.insetList().begin(); @@ -419,10 +430,21 @@ bool TextMetrics::redoParagraph(pit_type const pit) parPos.pos()++; } + // If there is an end of paragraph marker, its size should be + // 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() + && size_type(pit + 1) < text_->paragraphs().size()) { + Font f(text_->layoutFont(pit)); + // ¶ U+00B6 PILCROW SIGN + eop = theFontMetrics(f).width(char_type(0x00B6)); + } + // do the metric calculation Dimension dim; - int const w = max_width_ - leftMargin(max_width_, pit, ii->pos) - - right_margin; + int const w = max_width_ - leftMargin(pit, ii->pos) + - right_margin - eop; Font const & font = ii->inset->inheritFont() ? displayFont(pit, ii->pos) : bufferfont; MacroContext mc(&buffer, parPos); @@ -434,7 +456,6 @@ bool TextMetrics::redoParagraph(pit_type const pit) } } - par.setBeginOfBody(); pos_type first = 0; size_t row_index = 0; bool need_new_row = false; @@ -448,7 +469,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) row.pit(pit); need_new_row = breakRow(row, right_margin); setRowHeight(row); - row.setChanged(false); + 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 @@ -472,23 +493,37 @@ bool TextMetrics::redoParagraph(pit_type const pit) pm.dim().des += row.height(); } while (first < par.size() || need_new_row); + if (row_index < pm.rows().size()) + pm.rows().resize(row_index); + // FIXME: It might be better to move this in another method // specially tailored for the main text. // 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); if (pit == 0) { - pm.rows().front().dimension().asc += 20; - pm.dim().des += 20; + pm.rows().front().dimension().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). + */ + // coverity[copy_paste_error] + pm.dim().des += margin; } ParagraphList const & pars = text_->paragraphs(); if (pit + 1 == pit_type(pars.size())) { - pm.rows().back().dimension().des += 20; - pm.dim().des += 20; + pm.rows().back().dimension().des += margin; + pm.dim().des += margin; } } - if (row_index < pm.rows().size()) - pm.rows().resize(row_index); + // The space above and below the paragraph. + int const top = parTopSpacing(pit); + pm.rows().front().dimension().asc += top; + int const bottom = parBottomSpacing(pit); + pm.rows().back().dimension().des += bottom; + pm.dim().des += top + bottom; pm.dim().asc += pm.rows()[0].ascent(); pm.dim().des -= pm.rows()[0].ascent(); @@ -501,13 +536,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const { - Layout const & layout = par.layout(); - - LyXAlignment align; - if (par.params().align() == LYX_ALIGN_LAYOUT) - align = layout.align; - else - align = par.params().align(); + LyXAlignment align = par.getAlign(); // handle alignment inside tabular cells Inset const & owner = text_->inset(); @@ -554,10 +583,9 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const // not justify stuff, then don't stretch. // A forced block alignment can only be overridden the 'no // justification on screen' setting. - if (((row.right_boundary() || row.endpos() == par.size()) - && !forced_block) + if ((row.flushed() && !forced_block) || !bv_->buffer().params().justification) - align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT; + align = row.isRTL() ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT; } return align; @@ -612,27 +640,35 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const // Common case : there is no hfill, and the alignment will be // meaningful switch (getAlign(par, row)) { - case LYX_ALIGN_BLOCK: { - int const ns = row.countSeparators(); - // If we have separators, then stretch the row - if (ns) { - row.setSeparatorExtraWidth(double(w) / ns); - row.dimension().wid += w; - } else if (text_->isRTL(par)) { + case LYX_ALIGN_BLOCK: + // Expand expanding characters by a total of w + 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; } break; - } + case LYX_ALIGN_LEFT: + // a displayed inset that is flushed + if (Inset const * inset = par.getInset(row.pos())) { + row.left_margin += inset->indent(*bv_); + row.dimension().wid += inset->indent(*bv_); + } + break; case LYX_ALIGN_RIGHT: - row.left_margin += w; - row.dimension().wid += w; + 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; + } else { + row.left_margin += w; + row.dimension().wid += w; + } break; case LYX_ALIGN_CENTER: row.dimension().wid += w / 2; row.left_margin += w / 2; break; - case LYX_ALIGN_LEFT: case LYX_ALIGN_NONE: case LYX_ALIGN_LAYOUT: case LYX_ALIGN_SPECIAL: @@ -642,6 +678,7 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const return; } + // Case nh > 0. There are hfill separators. hfill = w / nh; hfill_rem = w % nh; row.dimension().wid += w; @@ -722,7 +759,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 { @@ -781,7 +818,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 @@ -797,7 +834,7 @@ 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); @@ -807,11 +844,6 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const // 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. @@ -830,10 +862,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)) { @@ -854,7 +883,23 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const } else if (c == '\t') row.addSpace(i, theFontMetrics(*fi).width(from_ascii(" ")), *fi, par.lookupChange(i)); - else { + else if (c == 0x2028 || c == 0x2029) { + /** + * U+2028 LINE SEPARATOR + * U+2029 PARAGRAPH SEPARATOR + + * These are special unicode characters that break + * lines/pragraphs. Not handling them lead to trouble wrt + * Qt QTextLayout formatting. We add a visible character + * on screen so that the user can see that something is + * happening. + */ + row.finalizeLast(); + // ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS + // ¶ 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") { @@ -891,7 +936,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const && inset->display()) || (!row.empty() && row.back().inset && row.back().inset->display())) { - row.right_boundary(true); + row.flushed(true); need_new_row = par.isNewline(i); ++i; break; @@ -899,11 +944,12 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const ++i; ++fi; - } while (i < end && row.width() <= width); + } row.finalizeLast(); row.endpos(i); - // End of paragraph marker + // End of paragraph marker. The logic here is almost the + // same as in redoParagraph, remember keep them in sync. ParagraphList const & pars = text_->paragraphs(); if (lyxrc.paragraph_markers && !need_new_row && i == end && size_type(row.pit() + 1) < pars.size()) { @@ -915,13 +961,26 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const BufferParams const & bparams = text_->inset().buffer().params(); f.setLanguage(par.getParLanguage(bparams)); + // ¶ U+00B6 PILCROW SIGN 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. - if (row.shortenIfNeeded(body_pos, width)) - row.right_boundary(false); + int const next_width = max_width_ - leftMargin(row.pit(), row.endpos()) + - rightMargin(row.pit()); + + 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 + if (row.endpos() == end) + row.flushed(true); // make sure that the RTL elements are in reverse ordering row.reverseRTL(is_rtl); @@ -930,13 +989,109 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const return need_new_row; } +int TextMetrics::parTopSpacing(pit_type const pit) const +{ + Paragraph const & par = text_->getPar(pit); + Layout const & layout = par.layout(); + + int asc = 0; + ParagraphList const & pars = text_->paragraphs(); + double const dh = defaultRowHeight(); + + BufferParams const & bparams = bv_->buffer().params(); + Inset const & inset = text_->inset(); + // some parskips VERY EASY IMPLEMENTATION + if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation + && !inset.getLayout().parbreakIsNewline() + && !par.layout().parbreak_is_newline + && pit > 0 + && ((layout.isParagraph() && par.getDepth() == 0) + || (pars[pit - 1].layout().isParagraph() + && pars[pit - 1].getDepth() == 0))) { + asc += bparams.getDefSkip().inPixels(*bv_); + } + + if (par.params().startOfAppendix()) + asc += int(3 * dh); + + // special code for the top label + if (layout.labelIsAbove() + && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit)) + && !par.labelString().empty()) { + FontInfo labelfont = text_->labelFont(par); + FontMetrics const & lfm = theFontMetrics(labelfont); + asc += int(lfm.maxHeight() * layout.spacing.getValue() + * text_->spacing(par) + + (layout.topsep + layout.labelbottomsep) * dh); + } -void TextMetrics::setRowHeight(Row & row, bool topBottomSpace) const + // Add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment. + + pit_type prev = text_->depthHook(pit, par.getDepth()); + Paragraph const & prevpar = pars[prev]; + double layoutasc = 0; + if (prev != pit + && prevpar.layout() == layout + && prevpar.getDepth() == par.getDepth() + && prevpar.getLabelWidthString() == par.getLabelWidthString()) { + layoutasc = layout.itemsep * dh; + } else if (pit != 0 && layout.topsep > 0) + layoutasc = layout.topsep * dh; + + asc += int(layoutasc * 2 / (2 + pars[pit].getDepth())); + + prev = text_->outerHook(pit); + 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) + asc += int(layout.parsep * dh); + } + + return asc; +} + + +int TextMetrics::parBottomSpacing(pit_type const pit) const +{ + double layoutdesc = 0; + ParagraphList const & pars = text_->paragraphs(); + double const dh = defaultRowHeight(); + + // add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment + pit_type nextpit = pit + 1; + if (nextpit != pit_type(pars.size())) { + pit_type cpit = pit; + + if (pars[cpit].getDepth() > pars[nextpit].getDepth()) { + double usual = pars[cpit].layout().bottomsep * dh; + double unusual = 0; + cpit = text_->depthHook(cpit, pars[nextpit].getDepth()); + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + unusual = pars[cpit].layout().bottomsep * dh; + layoutdesc = max(unusual, usual); + } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) { + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + layoutdesc = int(pars[cpit].layout().bottomsep * dh); + } + } + + return int(layoutdesc * 2 / (2 + pars[pit].getDepth())); +} + + +void TextMetrics::setRowHeight(Row & row) const { Paragraph const & par = text_->getPar(row.pit()); Layout const & layout = par.layout(); - double const spacing_val = layout.spacing.getValue() - * text_->spacing(par); + double const spacing_val = layout.spacing.getValue() * text_->spacing(par); // Initial value for ascent (useful if row is empty). Font const font = displayFont(row.pit(), row.pos()); @@ -962,103 +1117,7 @@ void TextMetrics::setRowHeight(Row & row, bool topBottomSpace) const ++maxasc; ++maxdes; - // Now use the layout information. - double layoutasc = 0; - double layoutdesc = 0; - int labeladdon = 0; - ParagraphList const & pars = text_->paragraphs(); - Inset const & inset = text_->inset(); - double const dh = defaultRowHeight(); - - // is it a top line? - if (row.pos() == 0 && topBottomSpace) { - BufferParams const & bufparams = bv_->buffer().params(); - // some parskips VERY EASY IMPLEMENTATION - if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation - && !inset.getLayout().parbreakIsNewline() - && !par.layout().parbreak_is_newline - && row.pit() > 0 - && ((layout.isParagraph() && par.getDepth() == 0) - || (pars[row.pit() - 1].layout().isParagraph() - && pars[row.pit() - 1].getDepth() == 0))) { - maxasc += bufparams.getDefSkip().inPixels(*bv_); - } - - if (par.params().startOfAppendix()) - maxasc += int(3 * dh); - - // special code for the top label - if (layout.labelIsAbove() - && (!layout.isParagraphGroup() || text_->isFirstInSequence(row.pit())) - && !par.labelString().empty()) { - FontInfo labelfont = text_->labelFont(par); - FontMetrics const & lfm = theFontMetrics(labelfont); - labeladdon = int( - lfm.maxHeight() - * layout.spacing.getValue() - * text_->spacing(par) - + (layout.topsep + layout.labelbottomsep) * dh); - } - - // Add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment. - - pit_type prev = text_->depthHook(row.pit(), par.getDepth()); - Paragraph const & prevpar = pars[prev]; - if (prev != row.pit() - && prevpar.layout() == layout - && prevpar.getDepth() == par.getDepth() - && prevpar.getLabelWidthString() - == par.getLabelWidthString()) { - layoutasc = layout.itemsep * dh; - } else if (row.pit() != 0 || row.pos() != 0) { - if (layout.topsep > 0) - layoutasc = layout.topsep * dh; - } - - prev = text_->outerHook(row.pit()); - if (prev != pit_type(pars.size())) { - maxasc += int(pars[prev].layout().parsep * dh); - } else if (row.pit() != 0) { - Paragraph const & prevpar = pars[row.pit() - 1]; - if (prevpar.getDepth() != 0 || - prevpar.layout() == layout) { - maxasc += int(layout.parsep * dh); - } - } - } - - // is it a bottom line? - if (row.endpos() >= par.size() && topBottomSpace) { - // add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment - pit_type nextpit = row.pit() + 1; - if (nextpit != pit_type(pars.size())) { - pit_type cpit = row.pit(); - - if (pars[cpit].getDepth() > pars[nextpit].getDepth()) { - double usual = pars[cpit].layout().bottomsep * dh; - double unusual = 0; - cpit = text_->depthHook(cpit, pars[nextpit].getDepth()); - if (pars[cpit].layout() != pars[nextpit].layout() - || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) - unusual = pars[cpit].layout().bottomsep * dh; - layoutdesc = max(unusual, usual); - } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) { - if (pars[cpit].layout() != pars[nextpit].layout() - || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) - layoutdesc = int(pars[cpit].layout().bottomsep * dh); - } - } - } - - // incalculate the layout spaces - maxasc += int(layoutasc * 2 / (2 + pars[row.pit()].getDepth())); - maxdes += int(layoutdesc * 2 / (2 + pars[row.pit()].getDepth())); - - row.dimension().asc = maxasc + labeladdon; + row.dimension().asc = maxasc; row.dimension().des = maxdes; } @@ -1113,8 +1172,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x, * how boundary helps here. */ else if (pos == cit->endpos - && cit + 1 != row.end() - && cit->isRTL() != (cit + 1)->isRTL()) + && ((!cit->isRTL() && cit + 1 != row.end() + && (cit + 1)->isRTL()) + || (cit->isRTL() && cit != row.begin() + && !(cit - 1)->isRTL()))) boundary = true; } @@ -1167,6 +1228,7 @@ void TextMetrics::newParMetricsDown() redoParagraph(pit); par_metrics_[pit].setPosition(last.second.position() + last.second.descent() + par_metrics_[pit].ascent()); + updatePosCache(pit); } @@ -1181,6 +1243,7 @@ void TextMetrics::newParMetricsUp() redoParagraph(pit); par_metrics_[pit].setPosition(first.second.position() - first.second.ascent() - par_metrics_[pit].descent()); + updatePosCache(pit); } // y is screen coordinate @@ -1301,23 +1364,19 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, } pit_type pit = getPitNearY(y); LASSERT(pit != -1, return 0); - - int yy = y; // is modified by getPitAndRowNearY - Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up); - + Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up); cur.pit() = pit; // Do we cover an inset? - InsetList::InsetTable * it = checkInsetHit(pit, x, yy); + InsetList::InsetTable * it = checkInsetHit(pit, x, y); if (!it) { // No inset, set position in the text bool bound = false; // is modified by getPosNearX - int xx = x; // is modified by getPosNearX - cur.pos() = getPosNearX(row, xx, bound); + cur.pos() = getPosNearX(row, x, bound); cur.boundary(bound); cur.setCurrentFont(); - cur.setTargetX(xx); + cur.setTargetX(x); return 0; } @@ -1330,23 +1389,17 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, cur.setTargetX(x); // Try to descend recursively inside the inset. - Inset * edited = inset->editXY(cur, x, yy); - if (edited == inset && cur.pos() == it->pos) { + Inset * edited = inset->editXY(cur, x, y); + // 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() == it->pos) { // non-editable inset, set cursor after the inset if x is // nearer to that position (bug 9628) - CoordCache::Insets const & insetCache = bv_->coordCache().getInsets(); - Dimension const & dim = insetCache.dim(inset); - Point p = insetCache.xy(inset); - bool const is_rtl = text_->isRTL(text_->getPar(pit)); - if (is_rtl) { - // "in front of" == "right of" - if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x)) - cur.posForward(); - } else { - // "in front of" == "left of" - if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x)) - cur.posForward(); - } + bool bound = false; // is modified by getPosNearX + cur.pos() = getPosNearX(row, x, bound); + cur.boundary(bound); + cur.setCurrentFont(); + cur.setTargetX(x); } if (cur.top().text() == text_) @@ -1400,28 +1453,12 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y) LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit); - InsetList::const_iterator iit = par.insetList().begin(); - InsetList::const_iterator iend = par.insetList().end(); - for (; iit != iend; ++iit) { - Inset * inset = iit->inset; - - LYXERR(Debug::DEBUG, "examining inset " << inset); - - if (!insetCache.has(inset)) { - LYXERR(Debug::DEBUG, "inset has no cached position"); - return 0; - } - - Dimension const & dim = insetCache.dim(inset); - Point p = insetCache.xy(inset); - - LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid - << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des); + for (auto const & it : par.insetList()) { + LYXERR(Debug::DEBUG, "examining inset " << it.inset); - if (x >= p.x_ && x <= p.x_ + dim.wid - && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) { - LYXERR(Debug::DEBUG, "Hit inset: " << inset); - return const_cast(&(*iit)); + if (insetCache.covers(it.inset, x, y)) { + LYXERR(Debug::DEBUG, "Hit inset: " << it.inset); + return const_cast(&it); } } @@ -1444,56 +1481,6 @@ Inset * TextMetrics::checkInsetHit(int x, int y) } -Row::const_iterator const -TextMetrics::findRowElement(Row const & row, pos_type const pos, - bool const boundary, double & x) const -{ - /** - * When boundary is true, position i is in the row element (pos, endpos) - * if - * pos < i <= endpos - * whereas, when boundary is false, the test is - * pos <= i < endpos - * The correction below allows to handle both cases. - */ - int const boundary_corr = (boundary && pos) ? -1 : 0; - - x = row.left_margin; - - /** Early return in trivial cases - * 1) the row is empty - * 2) the position is the left-most position of the row; there - * is a quirk here however: if the first element is virtual - * (end-of-par marker for example), then we have to look - * closer - */ - if (row.empty() - || (pos == row.begin()->left_pos() && !boundary - && !row.begin()->isVirtual())) - return row.begin(); - - Row::const_iterator cit = row.begin(); - for ( ; cit != row.end() ; ++cit) { - /** Look whether the cursor is inside the element's - * span. Note that it is necessary to take the - * boundary into account, and to accept virtual - * elements, which have pos == endpos. - */ - if (pos + boundary_corr >= cit->pos - && (pos + boundary_corr < cit->endpos || cit->isVirtual())) { - x += cit->pos2x(pos); - break; - } - x += cit->full_width(); - } - - if (cit == row.end()) - --cit; - - return cit; -} - - int TextMetrics::cursorX(CursorSlice const & sl, bool boundary) const { @@ -1506,7 +1493,7 @@ int TextMetrics::cursorX(CursorSlice const & sl, pos_type const pos = sl.pos(); double x = 0; - findRowElement(row, pos, boundary, x); + row.findElement(pos, boundary, x); return int(x); } @@ -1515,14 +1502,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) @@ -1586,7 +1573,7 @@ void TextMetrics::deleteLineForward(Cursor & cur) if (!cur.selection()) text_->deleteWordForward(cur); else - cap::cutSelection(cur, true, false); + cap::cutSelection(cur, false); cur.checkBufferStructure(); } } @@ -1606,14 +1593,13 @@ bool TextMetrics::isFirstRow(Row const & row) const } -int TextMetrics::leftMargin(int max_width, pit_type pit) const +int TextMetrics::leftMargin(pit_type pit) const { - return leftMargin(max_width, pit, text_->paragraphs()[pit].size()); + return leftMargin(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(); @@ -1632,10 +1618,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) { @@ -1646,7 +1632,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() && @@ -1745,7 +1731,7 @@ int TextMetrics::leftMargin(int max_width, ParagraphMetrics const & pm = par_metrics_[pit]; RowList::const_iterator rit = pm.rows().begin(); RowList::const_iterator end = pm.rows().end(); - int minfill = max_width; + int minfill = max_width_; for ( ; rit != end; ++rit) if (rit->fill() < minfill) minfill = rit->fill(); @@ -1753,50 +1739,45 @@ int TextMetrics::leftMargin(int max_width, 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; - - if (par.params().align() == LYX_ALIGN_LAYOUT) - align = layout.align; - else - align = par.params().align(); + LyXAlignment align = par.getAlign(); // set the correct parindent if (pos == 0 && (layout.labeltype == LABEL_NO_LABEL - || layout.labeltype == LABEL_ABOVE - || layout.labeltype == LABEL_CENTERED - || (layout.labeltype == LABEL_STATIC - && layout.latextype == LATEX_ENVIRONMENT - && !text_->isFirstInSequence(pit))) + || layout.labeltype == LABEL_ABOVE + || layout.labeltype == LABEL_CENTERED + || (layout.labeltype == LABEL_STATIC + && layout.latextype == LATEX_ENVIRONMENT + && !text_->isFirstInSequence(pit))) && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT) && !par.params().noindent() // in some insets, paragraphs are never indented && !text_->inset().neverIndent() // display style insets are always centered, omit indentation && !(!par.empty() - && par.isInset(pos) - && par.getInset(pos)->display()) + && par.isInset(pos) + && par.getInset(pos)->display()) && (!(tclass.isDefaultLayout(par.layout()) - || tclass.isPlainLayout(par.layout())) + || tclass.isPlainLayout(par.layout())) || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)) { - // use the parindent of the layout when the - // default indentation is used otherwise use - // the indentation set in the document - // settings - if (buffer.params().getIndentation().asLyXCommand() == "default") - l_margin += bfm.signedWidth(parindent); - else - l_margin += buffer.params().getIndentation().inPixels(*bv_); - } + /* use the parindent of the layout when the default + * indentation is used otherwise use the indentation set in + * the document settings + */ + if (buffer.params().getParIndent().empty()) + l_margin += bfm.signedWidth(parindent); + else + l_margin += buffer.params().getParIndent().inPixels(max_width_, bfm.em()); + } return l_margin; } @@ -1832,8 +1813,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]; @@ -1850,7 +1831,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const return; } - BufferParams const & bparams = bv_->buffer().params(); int const ww = bv_->workHeight(); Cursor const & cur = bv_->cursor(); DocIterator sel_beg = cur.selectionBegin(); @@ -1886,17 +1866,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; } @@ -1910,13 +1884,12 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const // 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, bparams)); + // has row changed since last paint? bool row_has_changed = row.changed() || bv_->hadHorizScrollOffset(text_, pit, row.pos()); @@ -1925,12 +1898,15 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const 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) { // Paint only the insets if the text itself is // unchanged. rp.paintOnlyInsets(); + row.changed(false); y += row.descent(); continue; } @@ -1941,21 +1917,28 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const 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_has_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_has_changed ? " row_has_changed" : "")); } // Backup full_repaint status and force full repaint @@ -1966,26 +1949,40 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); - rp.paintChangeBar(); - bool const is_rtl = text_->isRTL(text_->getPar(pit)); - if (i == 0 && !is_rtl) + if (row.needsChangeBar()) + rp.paintChangeBar(); + if (i == 0 && !row.isRTL()) rp.paintFirst(); - if (i == nrows - 1 && is_rtl) + if (i == nrows - 1 && row.isRTL()) rp.paintLast(); rp.paintText(); - if (i == nrows - 1 && !is_rtl) + if (i == nrows - 1 && !row.isRTL()) rp.paintLast(); - if (i == 0 && is_rtl) + 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, "."); } @@ -2001,18 +1998,19 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, DocIterator wordStart = bvcur; wordStart.pos() -= word.length(); - // get position on screen of the word start and end - //FIXME: Is it necessary to explicitly set this to false? - wordStart.boundary(false); - Point lxy = cur.bv().getPos(wordStart); - Point rxy = cur.bv().getPos(bvcur); - // calculate dimensions of the word Row row; + row.pit(bvcur.pit()); row.pos(wordStart.pos()); row.endpos(bvcur.pos()); - setRowHeight(row, false); + setRowHeight(row); dim = row.dimension(); + + // get position on screen of the word start and end + //FIXME: Is it necessary to explicitly set this to false? + wordStart.boundary(false); + Point lxy = cur.bv().getPos(wordStart); + Point rxy = cur.bv().getPos(bvcur); dim.wid = abs(rxy.x_ - lxy.x_); // calculate position of word