X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=d23c09d29bfacfe1ab6ef7533c3a8e24d79a3ede;hb=98621be1ba2a00a931e89020a164b4b8b54c597f;hp=13c1d02cdf83496c5c3951fc1ff0f9f0c44cc264;hpb=01f0ab64a76a422ad7a7b916f3564b37e8feab94;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 13c1d02cdf..d23c09d29b 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,11 +39,13 @@ #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" @@ -98,7 +99,7 @@ int numberOfHfills(Row const & row, ParagraphMetrics const & pm, } -} +} // namespace ///////////////////////////////////////////////////////////////////// // @@ -199,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; @@ -421,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); @@ -449,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 @@ -480,19 +500,21 @@ bool TextMetrics::redoParagraph(pit_type const pit) // 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 = bv_->zoomedPixels(20); if (pit == 0) { - pm.rows().front().dimension().asc += 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 += 20; + 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; } } @@ -626,15 +648,27 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const 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: @@ -725,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 { @@ -784,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 @@ -800,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); @@ -810,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. @@ -833,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)) { @@ -918,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()) { @@ -938,12 +965,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 @@ -1014,8 +1046,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); } @@ -1075,9 +1107,9 @@ void TextMetrics::setRowHeight(Row & row) const 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)); + FontMetrics const & fm2 = theFontMetrics(cit->font); + maxasc = max(maxasc, int(fm2.maxAscent() * spacing_val)); + maxdes = max(maxdes, int(fm2.maxDescent() * spacing_val)); } } @@ -1196,6 +1228,7 @@ void TextMetrics::newParMetricsDown() redoParagraph(pit); par_metrics_[pit].setPosition(last.second.position() + last.second.descent() + par_metrics_[pit].ascent()); + updatePosCache(pit); } @@ -1210,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 @@ -1261,9 +1295,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(); } @@ -1356,7 +1390,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, // 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() == it->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 @@ -1466,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) @@ -1557,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(); @@ -1597,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() && @@ -1696,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(); @@ -1704,45 +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 = 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; } @@ -1778,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]; @@ -1831,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; } @@ -1849,19 +1878,18 @@ 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_)); + // has row changed since last paint? bool row_has_changed = row.changed() || bv_->hadHorizScrollOffset(text_, pit, row.pos()); @@ -1870,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; } @@ -1886,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 @@ -1911,7 +1949,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); - rp.paintChangeBar(); + if (row.needsChangeBar()) + rp.paintChangeBar(); if (i == 0 && !row.isRTL()) rp.paintFirst(); if (i == nrows - 1 && row.isRTL()) @@ -1925,11 +1964,25 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const 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, "."); }