X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=8321b34ecadd030585ea06824e13f3dbfafbeb6b;hb=8c6ac457ecc69f57ab54cd8c9b8b7893607c65d6;hp=93c5297f048a0a5bdc725f5a8c9820e510123371;hpb=0b0c27ef59296e461a2de84b23430fb0c034be1d;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 93c5297f04..8321b34eca 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -27,7 +27,7 @@ #include "CoordCache.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "debug.h" +#include "support/debug.h" #include "FontIterator.h" #include "FuncRequest.h" #include "InsetList.h" @@ -40,6 +40,7 @@ #include "ParIterator.h" #include "rowpainter.h" #include "Text.h" +#include "TextClass.h" #include "VSpace.h" #include "mathed/MacroTable.h" @@ -48,12 +49,9 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -#include - using std::make_pair; using std::max; using std::min; -using std::endl; using std::pair; namespace lyx { @@ -358,7 +356,6 @@ bool TextMetrics::redoParagraph(pit_type const pit) pm.reset(par); Buffer & buffer = bv_->buffer(); - BufferParams const & bparams = buffer.params(); main_text_ = (text_ == &buffer.text()); bool changed = false; @@ -476,7 +473,6 @@ bool TextMetrics::redoParagraph(pit_type const pit) row.setDimension(dim); int const max_row_width = max(dim_.wid, dim.wid); computeRowMetrics(pit, row, max_row_width); - pm.computeRowSignature(row, bparams); first = end; ++row_index; @@ -501,7 +497,6 @@ bool TextMetrics::redoParagraph(pit_type const pit) row.setDimension(dim); int const max_row_width = max(dim_.wid, dim.wid); computeRowMetrics(pit, row, max_row_width); - pm.computeRowSignature(row, bparams); pm.dim().des += dim.height(); } @@ -517,9 +512,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) void TextMetrics::computeRowMetrics(pit_type const pit, Row & row, int width) const { - row.label_hfill = 0; - row.hfill = 0; row.separator = 0; Buffer & buffer = bv_->buffer(); @@ -559,12 +552,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit, row.label_hfill = labelFill(pit, row) / double(nlh); } - // are there any hfills in the row? - int const nh = numberOfHfills(par, row); - - if (nh) { - if (w > 0) - row.hfill = w / nh; + double hfill = 0; + if (w > 0) { + // are there any hfills in the row? + if (int nh = numberOfHfills(par, row)) + hfill = w / double(nh); // we don't have to look at the alignment if it is ALIGN_LEFT and // if the row is already larger then the permitted width as then // we force the LEFT_ALIGN'edness! @@ -643,6 +635,30 @@ void TextMetrics::computeRowMetrics(pit_type const pit, row.x += row.label_hfill; } } + + pos_type const endpos = row.endpos(); + pos_type body_pos = par.beginOfBody(); + if (body_pos > 0 + && (body_pos > endpos || !par.isLineSeparator(body_pos - 1))) + body_pos = 0; + + ParagraphMetrics & pm = par_metrics_[pit]; + InsetList::const_iterator ii = par.insetList().begin(); + InsetList::const_iterator iend = par.insetList().end(); + for ( ; ii != iend; ++ii) { + if (ii->pos >= endpos || ii->pos < row.pos() + || ii->inset->lyxCode() != HFILL_CODE) + continue; + Dimension dim = row.dimension(); + if (pm.hfillExpansion(row, ii->pos)) + dim.wid = int(ii->pos >= body_pos ? + max(hfill, 5.0) : row.label_hfill); + else + dim.wid = 5; + // Cache the inset dimension. + bv_->coordCache().insets().add(ii->inset, dim); + pm.setInsetDimension(ii->inset, dim); + } } @@ -1050,7 +1066,6 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, int const xo = origin_.x_; x -= xo; Paragraph const & par = text_->getPar(pit); - ParagraphMetrics const & pm = par_metrics_[pit]; Bidi bidi; bidi.computeTables(par, buffer, row); @@ -1087,19 +1102,9 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, tmpx -= singleWidth(pit, body_pos - 1); } - if (pm.hfillExpansion(row, c)) { - tmpx += singleWidth(pit, c); - if (c >= body_pos) - tmpx += row.hfill; - else - tmpx += row.label_hfill; - } else if (par.isSeparator(c)) { - tmpx += singleWidth(pit, c); - if (c >= body_pos) + tmpx += singleWidth(pit, c); + if (par.isSeparator(c) && c >= body_pos) tmpx += row.separator; - } else { - tmpx += singleWidth(pit, c); - } ++vc; } @@ -1224,13 +1229,10 @@ void TextMetrics::newParMetricsUp() pit_type TextMetrics::getPitNearY(int y) { BOOST_ASSERT(!text_->paragraphs().empty()); - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": y: " << y << " cache size: " << par_metrics_.size() - << endl; + LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size()); // look for highest numbered paragraph with y coordinate less than given y - pit_type pit = 0; + pit_type pit = -1; int yy = -1; ParMetricsCache::const_iterator it = par_metrics_.begin(); ParMetricsCache::const_iterator et = par_metrics_.end(); @@ -1238,44 +1240,37 @@ pit_type TextMetrics::getPitNearY(int y) ParagraphMetrics const & pm = it->second; - // If we are off-screen (before the visible part) - if (y < 0 - // and even before the first paragraph in the cache. - && y < it->second.position() - int(pm.ascent())) { - // and we are not at the first paragraph in the inset. + if (y < it->second.position() - int(pm.ascent())) { + // We are looking for a position that is before the first paragraph in + // the cache (which is in priciple off-screen, that is before the + // visible part. if (it->first == 0) + // We are already at the first paragraph in the inset. return 0; - // then this is the paragraph we are looking for. + // OK, this is the paragraph we are looking for. pit = it->first - 1; - // rebreak it and update the CoordCache. - redoParagraph(pit); - par_metrics_[pit].setPosition(it->second.position() - pm.descent()); + newParMetricsUp(); return pit; } ParagraphMetrics const & pm_last = par_metrics_[last->first]; - // If we are off-screen (after the visible part) - if (y > bv_->workHeight() - // and even after the first paragraph in the cache. - && y >= last->second.position() + int(pm_last.descent())) { + if (y >= last->second.position() + int(pm_last.descent())) { + // We are looking for a position that is after the last paragraph in + // the cache (which is in priciple off-screen, that is before the + // visible part. pit = last->first + 1; - // and we are not at the last paragraph in the inset. if (pit == int(text_->paragraphs().size())) + // We are already at the last paragraph in the inset. return last->first; - // then this is the paragraph we are looking for. - // rebreak it and update the CoordCache. - redoParagraph(pit); - par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent()); + // OK, this is the paragraph we are looking for. + newParMetricsDown(); return pit; } for (; it != et; ++it) { - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << " examining: pit: " << it->first - << " y: " << it->second.position() - << endl; + LYXERR(Debug::DEBUG, "examining: pit: " << it->first + << " y: " << it->second.position()); ParagraphMetrics const & pm = par_metrics_[it->first]; @@ -1285,10 +1280,7 @@ pit_type TextMetrics::getPitNearY(int y) } } - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": found best y: " << yy << " for pit: " << pit - << endl; + LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit); return pit; } @@ -1315,7 +1307,7 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const Inset * TextMetrics::editXY(Cursor & cur, int x, int y) { if (lyxerr.debugging(Debug::WORKAREA)) { - lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl; + LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")"); cur.bv().coordCache().dump(); } pit_type pit = getPitNearY(y); @@ -1377,12 +1369,8 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const ParagraphMetrics const & pm = par_metrics_[pit]; int yy = pm.position() - pm.ascent(); - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": x: " << x - << " y: " << y - << " pit: " << pit - << " yy: " << yy << endl; + LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << + " pit: " << pit << " yy: " << yy); int r = 0; BOOST_ASSERT(pm.rows().size()); @@ -1395,21 +1383,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const Row const & row = pm.rows()[r]; - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": row " << r - << " from pos: " << row.pos() - << endl; + LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos()); bool bound = false; int xx = x; pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound); - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": setting cursor pit: " << pit - << " pos: " << pos - << endl; + LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos); text_->setCursor(cur, pit, pos, true, bound); // remember new position. @@ -1426,51 +1406,36 @@ Inset * TextMetrics::checkInsetHit(int x, int y) Paragraph const & par = text_->paragraphs()[pit]; ParagraphMetrics const & pm = par_metrics_[pit]; - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": x: " << x - << " y: " << y - << " pit: " << pit - << endl; + 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) - << BOOST_CURRENT_FUNCTION - << ": examining inset " << inset << endl; + LYXERR(Debug::DEBUG, "examining inset " << inset); if (!bv_->coordCache().getInsets().has(inset)) { - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": inset has no cached position" << endl; + LYXERR(Debug::DEBUG, "inset has no cached position"); return 0; } Dimension const & dim = pm.insetDimension(inset); Point p = bv_->coordCache().getInsets().xy(inset); - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": xo: " << p.x_ << "..." << p.x_ + dim.wid - << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des - << endl; + LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid + << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des); if (x >= p.x_ && x <= p.x_ + dim.wid && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) { - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": Hit inset: " << inset << endl; + LYXERR(Debug::DEBUG, "Hit inset: " << inset); return inset; } } - LYXERR(Debug::DEBUG) - << BOOST_CURRENT_FUNCTION - << ": No inset hit. " << endl; + LYXERR(Debug::DEBUG, "No inset hit. "); return 0; } @@ -1557,9 +1522,7 @@ int TextMetrics::cursorX(CursorSlice const & sl, x += pm.singleWidth(pos, font); - if (pm.hfillExpansion(row, pos)) - x += (pos >= body_pos) ? row.hfill : row.label_hfill; - else if (par.isSeparator(pos) && pos >= body_pos) + if (par.isSeparator(pos) && pos >= body_pos) x += row.separator; } @@ -1887,7 +1850,6 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const } -// only used for inset right now. should also be used for main text void TextMetrics::draw(PainterInfo & pi, int x, int y) const { if (par_metrics_.empty()) @@ -1913,74 +1875,72 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const { -// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl; - int const ww = bv_->workHeight(); - + BufferParams const & bparams = bv_->buffer().params(); ParagraphMetrics const & pm = par_metrics_[pit]; if (pm.rows().empty()) return; - RowList::const_iterator const rb = pm.rows().begin(); - RowList::const_iterator const re = pm.rows().end(); - Bidi bidi; - bool const original_drawing_state = pi.pain.isDrawingEnabled(); + int const ww = bv_->workHeight(); + size_t const nrows = pm.rows().size(); + + for (size_t i = 0; i != nrows; ++i) { - y -= rb->ascent(); - for (RowList::const_iterator rit = rb; rit != re; ++rit) { - y += rit->ascent(); + Row const & row = pm.rows()[i]; + if (i) + y += row.ascent(); - bool const inside = (y + rit->descent() >= 0 - && y - rit->ascent() < ww); - // it is not needed to draw on screen if we are not inside. + bool const inside = (y + row.descent() >= 0 + && y - row.ascent() < ww); + // It is not needed to draw on screen if we are not inside. pi.pain.setDrawingEnabled(inside && original_drawing_state); - RowPainter rp(pi, *text_, pit, *rit, bidi, x, y); + RowPainter rp(pi, *text_, pit, row, bidi, x, y); // Row signature; has row changed since last paint? - bool row_has_changed = rit->changed(); + row.setCrc(pm.computeRowSignature(row, bparams)); + bool row_has_changed = row.changed(); - bool row_selection = rit->sel_beg != -1 && rit->sel_end != -1; - - if (!row_selection && !pi.full_repaint && !row_has_changed) { - // Paint the only the insets if the text itself is + // 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(); - y += rit->descent(); + y += row.descent(); continue; } - // Paint the row if a full repaint has been requested or it has - // changed. - // Clear background of this row - // (if paragraph background was not cleared) - if (row_selection || (!pi.full_repaint && row_has_changed)) { - pi.pain.fillRectangle(x, y - rit->ascent(), - width(), rit->height(), pi.background_color); + // Clear background of this row if paragraph background was not + // already cleared because of a full repaint. + if (!pi.full_repaint && row_has_changed) { + pi.pain.fillRectangle(x, y - row.ascent(), + width(), row.height(), pi.background_color); } + + bool row_selection = row.sel_beg != -1 && row.sel_end != -1; if (row_selection) { DocIterator beg = bv_->cursor().selectionBegin(); DocIterator end = bv_->cursor().selectionEnd(); + bool const beg_margin = beg.pit() < pit && i == 0; + bool const end_margin = end.pit() > pit && i == nrows - 1; beg.pit() = pit; - beg.pos() = rit->sel_beg; - if (pit == end.pit()) { - end.pos() = rit->sel_end; - } else { - end.pit() = pit + 1; - end.pos() = 0; - } - drawSelection(pi, beg, end, x); + beg.pos() = row.sel_beg; + end.pit() = pit; + end.pos() = row.sel_end; + drawRowSelection(pi, x, row, beg, end, beg_margin, end_margin); } // Instrumentation for testing row cache (see also // 12 lines lower): - if (lyxerr.debugging(Debug::PAINTING)) { - if (text_->isMainText(bv_->buffer())) - LYXERR(Debug::PAINTING) << "\n{" << inside << - pi.full_repaint << row_has_changed << "}"; - else - LYXERR(Debug::PAINTING) << "[" << inside << - pi.full_repaint << row_has_changed << "]"; + if (lyxerr.debugging(Debug::PAINTING) && inside + && (row_selection || pi.full_repaint || row_has_changed)) { + std::string const foreword = text_->isMainText(bv_->buffer()) ? + "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); } // Backup full_repaint status and force full repaint @@ -1990,78 +1950,19 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co rp.paintAppendix(); rp.paintDepthBar(); rp.paintChangeBar(); - if (rit == rb) + if (i == 0) rp.paintFirst(); rp.paintText(); - if (rit + 1 == re) + if (i == nrows - 1) rp.paintLast(); - y += rit->descent(); + y += row.descent(); // Restore full_repaint status. pi.full_repaint = tmp; } // Re-enable screen drawing for future use of the painter. pi.pain.setDrawingEnabled(original_drawing_state); - //LYXERR(Debug::PAINTING) << "." << endl; -} - - -// FIXME: only take care of one row! -void TextMetrics::drawSelection(PainterInfo & pi, - DocIterator const & beg, DocIterator const & end, int x) const -{ - ParagraphMetrics const & pm1 = parMetrics(beg.pit()); - ParagraphMetrics const & pm2 = parMetrics(end.pit()); - Row const & row1 = pm1.getRow(beg.pos(), beg.boundary()); - Row const & row2 = pm2.getRow(end.pos(), end.boundary()); - - // clip above - int middleTop; - bool const clipAbove = (bv_->cursorStatus(beg) == CUR_ABOVE); - if (clipAbove) - middleTop = 0; - else - middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent(); - - // clip below - int middleBottom; - bool const clipBelow = (bv_->cursorStatus(end) == CUR_BELOW); - if (clipBelow) - middleBottom = bv_->workHeight(); - else - middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent(); - - // start and end in the same line? - if (!clipAbove && !clipBelow && &row1 == &row2) - // then only draw this row's selection - drawRowSelection(pi, x, row1, beg, end, false, false); - else { - if (!clipAbove) { - // get row end - DocIterator begRowEnd = beg; - begRowEnd.pos() = row1.endpos(); - begRowEnd.boundary(true); - - // draw upper rectangle - drawRowSelection(pi, x, row1, beg, begRowEnd, false, true); - } - - if (middleTop < middleBottom) { - // draw middle rectangle - pi.pain.fillRectangle(x, middleTop, width(), middleBottom - middleTop, - Color_selection); - } - - if (!clipBelow) { - // get row begin - DocIterator endRowBeg = end; - endRowBeg.pos() = row2.pos(); - endRowBeg.boundary(false); - - // draw low rectangle - drawRowSelection(pi, x, row2, endRowBeg, end, true, false); - } - } + //LYXERR(Debug::PAINTING, "."); }