X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=ecc9e5219487d3015fde15ecb0d6aaf336fcb139;hb=3dfe917a4ed504de29ac18028936d02f856c92b1;hp=19a71ffbb99154ad41ed597c0ab4431929aaf0b5;hpb=25df3fa83d227ae2a1c525af3d2ca9e6e5ab47a8;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 19a71ffbb9..ecc9e52194 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -27,7 +27,6 @@ #include "CoordCache.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "FuncRequest.h" #include "HSpace.h" #include "InsetList.h" #include "Layout.h" @@ -134,8 +133,6 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text) dim_.wid = max_width_; dim_.asc = 10; dim_.des = 10; - - //text_->updateBuffer(bv->buffer()); } @@ -161,6 +158,7 @@ pair TextMetrics::first() const pair TextMetrics::last() const { + LASSERT(!par_metrics_.empty(), /**/); ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin(); return make_pair(it->first, &it->second); } @@ -306,11 +304,8 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const { - if (!lyxrc.rtl_support) - return false; - // no RTL boundary at paragraph start - if (pos == 0) + if (!lyxrc.rtl_support || pos == 0) return false; Font const & left_font = displayFont(pit, pos - 1); @@ -319,6 +314,9 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const } +// isRTLBoundary returns false on a real end-of-line boundary, +// because otherwise the two boundary types get mixed up. +// This is the whole purpose of this being in TextMetrics. bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, Font const & font) const { @@ -404,6 +402,9 @@ bool TextMetrics::redoParagraph(pit_type const pit) LYXERR(Debug::INFO, "MacroContext not initialised!" << " Going through the buffer again and hope" << " the context is better then."); + // FIXME audit updateBuffer calls + // This should not be here, but it is not clear yet where else it + // should be. bv_->buffer().updateBuffer(); parPos = text_->macrocontextPosition(); LASSERT(!parPos.empty(), /**/); @@ -411,12 +412,11 @@ bool TextMetrics::redoParagraph(pit_type const pit) } // redo insets - // FIXME: We should always use getFont(), see documentation of - // noFontChange() in Inset.h. Font const bufferfont = buffer.params().getFont(); InsetList::const_iterator ii = par.insetList().begin(); InsetList::const_iterator iend = par.insetList().end(); for (; ii != iend; ++ii) { + // FIXME Doesn't this HAVE to be non-empty? // position already initialized? if (!parPos.empty()) { parPos.pos() = ii->pos; @@ -433,8 +433,8 @@ bool TextMetrics::redoParagraph(pit_type const pit) Dimension dim; int const w = max_width_ - leftMargin(max_width_, pit, ii->pos) - right_margin; - Font const & font = ii->inset->noFontChange() ? - bufferfont : displayFont(pit, ii->pos); + Font const & font = ii->inset->inheritFont() ? + displayFont(pit, ii->pos) : bufferfont; MacroContext mc(&buffer, parPos); MetricsInfo mi(bv_, font.fontInfo(), w, mc); ii->inset->metrics(mi, dim); @@ -1067,16 +1067,14 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first, if (first == 0 && topBottomSpace) { BufferParams const & bufparams = buffer.params(); // some parskips VERY EASY IMPLEMENTATION - if (bufparams.paragraph_separation - == BufferParams::ParagraphSkipSeparation - && inset.lyxCode() != ERT_CODE - && inset.lyxCode() != LISTINGS_CODE - && pit > 0 - && ((layout.isParagraph() && par.getDepth() == 0) - || (pars[pit - 1].layout().isParagraph() - && pars[pit - 1].getDepth() == 0))) - { - maxasc += bufparams.getDefSkip().inPixels(*bv_); + if (bufparams.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))) { + maxasc += bufparams.getDefSkip().inPixels(*bv_); } if (par.params().startOfAppendix()) @@ -1222,10 +1220,18 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, return 0; } - // if the first character is a separator, we are in RTL - // text. This character will not be painted on screen + // This (rtl_support test) is not needed, but gives + // some speedup if rtl_support == false + bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size(); + + // If lastrow is false, we don't need to compute + // the value of rtl. + bool const rtl = lastrow ? text_->isRTL(par) : false; + + // if the first character is a separator, and we are in RTL + // text, this character will not be painted on screen // and thus we should not count it and skip to the next. - if (par.isSeparator(bidi.vis2log(vc))) + if (rtl && par.isSeparator(bidi.vis2log(vc))) ++vc; while (vc < end && tmpx <= x) { @@ -1253,13 +1259,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, LASSERT(vc <= end, /**/); // This shouldn't happen. boundary = false; - // This (rtl_support test) is not needed, but gives - // some speedup if rtl_support == false - bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size(); - // If lastrow is false, we don't need to compute - // the value of rtl. - bool const rtl = lastrow ? text_->isRTL(par) : false; if (lastrow && ((rtl && left_side && vc == row.pos() && x < tmpx - 5) || (!rtl && !left_side && vc == end && x > tmpx + 5))) { @@ -1511,7 +1511,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, // This should be just before or just behind the // cursor position set above. LASSERT(inset == inset_before - || inset == pars[pit].getInset(pos), /**/); + || inset == pars[pit].getInset(pos), return 0); // Make sure the cursor points to the position before // this inset. @@ -2005,7 +2005,7 @@ int TextMetrics::leftMargin(int max_width, || (layout.labeltype == LABEL_STATIC && layout.latextype == LATEX_ENVIRONMENT && !text_->isFirstInSequence(pit))) - && align == LYX_ALIGN_BLOCK + && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT) && !par.params().noindent() // in some insets, paragraphs are never indented && !text_->inset().neverIndent() @@ -2015,14 +2015,15 @@ int TextMetrics::leftMargin(int max_width, && par.getInset(pos)->display()) && (!(tclass.isDefaultLayout(par.layout()) || tclass.isPlainLayout(par.layout())) - || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation) + || 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 + // 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 += theFontMetrics(buffer.params().getFont()).signedWidth( - parindent); + l_margin += theFontMetrics( + buffer.params().getFont()).signedWidth(parindent); else l_margin += buffer.params().getIndentation().inPixels(*bv_); } @@ -2081,7 +2082,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // This is our text. && cur.text() == text_ // if the anchor is outside, this is not our selection - && cur.anchor().text() == text_ + && cur.normalAnchor().text() == text_ && pit >= sel_beg.pit() && pit <= sel_end.pit(); // We store the begin and end pos of the selection relative to this par @@ -2132,15 +2133,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // Take this opportunity to spellcheck the row contents. if (row_has_changed && lyxrc.spellcheck_continuously) { - WordLangTuple wl; - // dummy variable, not used. - static docstring_list suggestions; - pos_type from = row.pos(); - pos_type to = row.endpos(); - while (from < row.endpos()) { - text_->getPar(pit).spellCheck(from, to, wl, suggestions, false); - from = to + 1; - } + text_->getPar(pit).spellCheck(); } // Don't paint the row if a full repaint has not been requested @@ -2160,9 +2153,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co width(), row.height(), pi.background_color); } - if (row.selection()) - drawRowSelection(pi, x, row, cur, pit); - // Instrumentation for testing row cache (see also // 12 lines lower): if (lyxerr.debugging(Debug::PAINTING) && inside @@ -2179,6 +2169,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // for inner insets as the Row has been cleared out. bool tmp = pi.full_repaint; pi.full_repaint = true; + + rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); rp.paintChangeBar(); @@ -2193,6 +2185,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co if (i == 0 && is_rtl) rp.paintFirst(); y += row.descent(); + // Restore full_repaint status. pi.full_repaint = tmp; } @@ -2203,102 +2196,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co } -void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row, - Cursor const & curs, pit_type pit) const -{ - DocIterator beg = curs.selectionBegin(); - beg.pit() = pit; - beg.pos() = row.sel_beg; - - DocIterator end = curs.selectionEnd(); - end.pit() = pit; - end.pos() = row.sel_end; - - bool const begin_boundary = beg.pos() >= row.endpos(); - bool const end_boundary = row.sel_end == row.endpos(); - - DocIterator cur = beg; - cur.boundary(begin_boundary); - int x1 = cursorX(beg.top(), begin_boundary); - int x2 = cursorX(end.top(), end_boundary); - int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent(); - int const y2 = y1 + row.height(); - - int const rm = text_->isMainText() ? bv_->rightMargin() : 0; - int const lm = text_->isMainText() ? bv_->leftMargin() : 0; - - // draw the margins - if (row.begin_margin_sel) { - if (text_->isRTL(beg.paragraph())) { - pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1, - Color_selection); - } else { - pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1, - Color_selection); - } - } - - if (row.end_margin_sel) { - if (text_->isRTL(beg.paragraph())) { - pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1, - Color_selection); - } else { - pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1, - Color_selection); - } - } - - // if we are on a boundary from the beginning, it's probably - // a RTL boundary and we jump to the other side directly as this - // segement is 0-size and confuses the logic below - if (cur.boundary()) - cur.boundary(false); - - // go through row and draw from RTL boundary to RTL boundary - while (cur < end) { - bool draw_now = false; - - // simplified cursorForward code below which does not - // descend into insets and which does not go into the - // next line. Compare the logic with the original cursorForward - - // if left of boundary -> just jump to right side, but - // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi - if (cur.boundary()) { - cur.boundary(false); - } else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) { - // in front of RTL boundary -> Stay on this side of the boundary - // because: ab|cDDEEFFghi -> abc|DDEEFFghi - ++cur.pos(); - cur.boundary(true); - draw_now = true; - } else { - // move right - ++cur.pos(); - - // line end? - if (cur.pos() == row.endpos()) - cur.boundary(true); - } - - if (x1 == -1) { - // the previous segment was just drawn, now the next starts - x1 = cursorX(cur.top(), cur.boundary()); - } - - if (!(cur < end) || draw_now) { - x2 = cursorX(cur.top(), cur.boundary()); - pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1, - Color_selection); - - // reset x1, so it is set again next round (which will be on the - // right side of a boundary or at the selection end) - x1 = -1; - } - } -} - - void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const { @@ -2310,8 +2207,10 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, wordStart.pos() -= word.length(); // get position on screen of the word start and end - Point lxy = cur.bv().getPos(wordStart, false); - Point rxy = cur.bv().getPos(bvcur, bvcur.boundary()); + //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 dim = rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);