do what the FIXME suggested

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index acf39a45fbd174f94625391649b6f15d1e0040f5..ca2670b6e1b2f2c7a9346276ff55d821557d2168 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -128,7 +128,7 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text)
 }
 
 
-bool TextMetrics::has(pit_type pit) const
+bool TextMetrics::contains(pit_type pit) const
 {
        return par_metrics_.find(pit) != par_metrics_.end();
 }
@@ -241,7 +241,7 @@ void TextMetrics::applyOuterFont(Font & font) const
 }
 
 
-Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
+Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 {
        BOOST_ASSERT(pos >= 0);
 
@@ -302,7 +302,7 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const
        if (boundary && sl.pos() > 0)
                correction = -1;
                
-       return getDisplayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
+       return displayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
 }
 
 
@@ -317,12 +317,12 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 
        Paragraph const & par = text_->getPar(pit);
 
-       bool left = getDisplayFont(pit, pos - 1).isVisibleRightToLeft();
+       bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
        bool right;
        if (pos == par.size())
                right = par.isRTL(bv_->buffer().params());
        else
-               right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+               right = displayFont(pit, pos).isVisibleRightToLeft();
        return left != right;
 }
 
@@ -339,7 +339,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
        if (pos == par.size())
                right = par.isRTL(bv_->buffer().params());
        else
-               right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+               right = displayFont(pit, pos).isVisibleRightToLeft();
        return left != right;
 }
 
@@ -414,7 +414,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
                        - right_margin;
                Font const & font = ii->inset->noFontChange() ?
-                       bufferfont : getDisplayFont(pit, ii->pos);
+                       bufferfont : displayFont(pit, ii->pos);
                MacroContext mc(buffer, parPos);
                MetricsInfo mi(bv_, font.fontInfo(), w, mc);
                ii->inset->metrics(mi, dim);
@@ -423,28 +423,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                changed |= (old_dim != dim);
        }
 
-       Cursor const & cur = bv_->cursor();
-       DocIterator sel_beg = cur.selectionBegin();
-       DocIterator sel_end = cur.selectionEnd();
-       bool selection = cur.selection()
-               // This is out text.
-               && cur.text() == text_
-               // if the anchor is outside, this is not our selection 
-               && cur.anchor().text() == text_
-               && pit >= sel_beg.pit() && pit <= sel_end.pit();
-
-       // We care only about visible selection.
-       if (selection) {
-               if (pit != sel_beg.pit()) {
-                       sel_beg.pit() = pit;
-                       sel_beg.pos() = 0;
-               }
-               if (pit != sel_end.pit()) {
-                       sel_end.pit() = pit;
-                       sel_end.pos() = sel_end.lastpos();
-               }
-       }
-
        par.setBeginOfBody();
        pos_type first = 0;
        size_t row_index = 0;
@@ -467,10 +445,6 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                row.setChanged(false);
                row.pos(first);
                row.endpos(end);
-               if (selection)
-                       row.setSelection(sel_beg.pos(), sel_end.pos());
-               else
-                       row.setSelection(-1, -1);
                row.setDimension(dim);
                int const max_row_width = max(dim_.wid, dim.wid);
                computeRowMetrics(pit, row, max_row_width);
@@ -627,7 +601,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                if (body_pos > 0
                    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
                {
-                       row.x += theFontMetrics(text_->getLabelFont(buffer, par)).
+                       row.x += theFontMetrics(text_->labelFont(buffer, par)).
                                width(layout->labelsep);
                        if (body_pos <= end)
                                row.x += row.label_hfill;
@@ -684,7 +658,7 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
                return 0;
 
        FontMetrics const & fm
-               = theFontMetrics(text_->getLabelFont(buffer, par));
+               = theFontMetrics(text_->labelFont(buffer, par));
 
        return max(0, fm.width(label) - w);
 }
@@ -767,7 +741,7 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                // add the auto-hfill from label end to the body
                if (body_pos && i == body_pos) {
                        FontMetrics const & fm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
+                               text_->labelFont(buffer, par));
                        int add = fm.width(layout->labelsep);
                        if (par.isLineSeparator(i - 1))
                                add -= singleWidth(pit, i - 1);
@@ -864,7 +838,7 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
                for ( ; i < end; ++i, ++fi) {
                        if (body_pos > 0 && i == body_pos) {
                                FontMetrics const & fm = theFontMetrics(
-                                       text_->getLabelFont(buffer, par));
+                                       text_->labelFont(buffer, par));
                                w += fm.width(par.layout()->labelsep);
                                if (par.isLineSeparator(i - 1))
                                        w -= singleWidth(pit, i - 1);
@@ -883,7 +857,7 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 
        if (body_pos > 0 && body_pos >= end) {
                FontMetrics const & fm = theFontMetrics(
-                       text_->getLabelFont(buffer, par));
+                       text_->labelFont(buffer, par));
                w += fm.width(par.layout()->labelsep);
                if (end > 0 && par.isLineSeparator(end - 1))
                        w -= singleWidth(pit, end - 1);
@@ -913,13 +887,13 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
        // start with so we don't have to do the assignment below too
        // often.
        Buffer const & buffer = bv_->buffer();
-       Font font = getDisplayFont(pit, first);
+       Font font = displayFont(pit, first);
        FontSize const tmpsize = font.fontInfo().size();
-       font.fontInfo() = text_->getLayoutFont(buffer, pit);
+       font.fontInfo() = text_->layoutFont(buffer, pit);
        FontSize const size = font.fontInfo().size();
        font.fontInfo().setSize(tmpsize);
 
-       FontInfo labelfont = text_->getLabelFont(buffer, par);
+       FontInfo labelfont = text_->labelFont(buffer, par);
 
        FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
        FontMetrics const & fontmetrics = theFontMetrics(font);
@@ -1129,7 +1103,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
                last_tmpx = tmpx;
                if (body_pos > 0 && c == body_pos - 1) {
                        FontMetrics const & fm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
+                               text_->labelFont(buffer, par));
                        tmpx += row.label_hfill + fm.width(layout->labelsep);
                        if (par.isLineSeparator(body_pos - 1))
                                tmpx -= singleWidth(pit, body_pos - 1);
@@ -1532,8 +1506,8 @@ int TextMetrics::cursorX(CursorSlice const & sl,
        if (inlineCompletionPos.inTexted()
            && inlineCompletionPos.text() == text_
            && inlineCompletionPos.pit() == pit
-           && inlineCompletionPos.pos() >= row_pos
-           && inlineCompletionPos.pos() <= end) {
+           && inlineCompletionPos.pos() - 1 >= row_pos
+           && inlineCompletionPos.pos() - 1 < end) {
                // draw logically behind the previous character
                inlineCompletionVPos = bidi.log2vis(inlineCompletionPos.pos() - 1);
        }
@@ -1550,7 +1524,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
        // Inline completion RTL special case row_pos == cursor_pos:
        // "__|b" => cursor_pos is right of __
        if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
-               font = getDisplayFont(pit, row_pos + 1);
+               font = displayFont(pit, row_pos + 1);
                docstring const & completion = bv_->inlineCompletion();
                if (font.isRightToLeft() && completion.length() > 0)
                        x += theFontMetrics(font.fontInfo()).width(completion);
@@ -1563,7 +1537,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                pos_type pos = bidi.vis2log(vpos);
                if (body_pos > 0 && pos == body_pos - 1) {
                        FontMetrics const & labelfm = theFontMetrics(
-                               text_->getLabelFont(buffer, par));
+                               text_->labelFont(buffer, par));
                        x += row.label_hfill + labelfm.width(par.layout()->labelsep);
                        if (par.isLineSeparator(body_pos - 1))
                                x -= singleWidth(pit, body_pos - 1);
@@ -1572,7 +1546,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                // Use font span to speed things up, see above
                if (pos < font_span.first || pos > font_span.last) {
                        font_span = par.fontSpan(pos);
-                       font = getDisplayFont(pit, pos);
+                       font = displayFont(pit, pos);
                }
 
                x += pm.singleWidth(pos, font);
@@ -1581,7 +1555,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                // "a__|b", __ of b => non-boundary a-pos is right of __
                if (vpos + 1 == inlineCompletionVPos 
                    && (vpos + 1 < cursor_vpos || !boundary_correction)) {
-                       font = getDisplayFont(pit, vpos + 1);
+                       font = displayFont(pit, vpos + 1);
                        docstring const & completion = bv_->inlineCompletion();
                        if (font.isRightToLeft() && completion.length() > 0)
                                x += theFontMetrics(font.fontInfo()).width(completion);
@@ -1591,7 +1565,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
                // "b|__a", __ of b => non-boundary a-pos is in front of __
                if (vpos == inlineCompletionVPos
                    && (vpos + 1 < cursor_vpos || boundary_correction)) {
-                       font = getDisplayFont(pit, vpos);
+                       font = displayFont(pit, vpos);
                        docstring const & completion = bv_->inlineCompletion();
                        if (!font.isRightToLeft() && completion.length() > 0)
                                x += theFontMetrics(font.fontInfo()).width(completion);
@@ -1764,7 +1738,7 @@ int TextMetrics::leftMargin(int max_width,
        BOOST_ASSERT(pos <= par.size());
        Buffer const & buffer = bv_->buffer();
        //lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
-       TextClass const & tclass = buffer.params().textClass();
+       DocumentClass const & tclass = buffer.params().documentClass();
        LayoutPtr const & layout = par.layout();
 
        docstring parindent = layout->parindent;
@@ -1801,7 +1775,7 @@ int TextMetrics::leftMargin(int max_width,
            && pit > 0 && pars[pit - 1].layout()->nextnoindent)
                parindent.erase();
 
-       FontInfo const labelfont = text_->getLabelFont(buffer, par);
+       FontInfo const labelfont = text_->labelFont(buffer, par);
        FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
        switch (layout->margintype) {
@@ -1922,7 +1896,7 @@ int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
 {
        ParagraphMetrics const & pm = par_metrics_[pit];
 
-       return pm.singleWidth(pos, getDisplayFont(pit, pos));
+       return pm.singleWidth(pos, displayFont(pit, pos));
 }
 
 
@@ -1961,6 +1935,28 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
        int const ww = bv_->workHeight();
        size_t const nrows = pm.rows().size();
 
+       Cursor const & cur = bv_->cursor();
+       DocIterator sel_beg = cur.selectionBegin();
+       DocIterator sel_end = cur.selectionEnd();
+       bool selection = cur.selection()
+               // This is our text.
+               && cur.text() == text_
+               // if the anchor is outside, this is not our selection 
+               && cur.anchor().text() == text_
+               && pit >= sel_beg.pit() && pit <= sel_end.pit();
+
+       // We care only about visible selection.
+       if (selection) {
+               if (pit != sel_beg.pit()) {
+                       sel_beg.pit() = pit;
+                       sel_beg.pos() = 0;
+               }
+               if (pit != sel_end.pit()) {
+                       sel_end.pit() = pit;
+                       sel_end.pos() = sel_end.lastpos();
+               }
+       }
+
        for (size_t i = 0; i != nrows; ++i) {
 
                Row const & row = pm.rows()[i];
@@ -1973,6 +1969,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
                pi.pain.setDrawingEnabled(inside && original_drawing_state);
                RowPainter rp(pi, *text_, pit, row, bidi, x, y);
 
+               if (selection)
+                       row.setSelection(sel_beg.pos(), sel_end.pos());
+               else
+                       row.setSelection(-1, -1);
+
                // Row signature; has row changed since last paint?
                row.setCrc(pm.computeRowSignature(row, bparams));
                bool row_has_changed = row.changed();