Fix bug #9813

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index d62dae76d4a3864b2ad75d831dc06e9441e07b3c..2ec798ffe48de2b321709c7bc659af68834a6a54 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -28,6 +28,7 @@
 #include "CutAndPaste.h"
 #include "HSpace.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "Layout.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -399,6 +400,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
        // redo insets
        Font const bufferfont = buffer.params().getFont();
+       CoordCache::Insets & insetCache = bv_->coordCache().insets();
        InsetList::const_iterator ii = par.insetList().begin();
        InsetList::const_iterator iend = par.insetList().end();
        for (; ii != iend; ++ii) {
@@ -424,9 +426,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                MacroContext mc(&buffer, parPos);
                MetricsInfo mi(bv_, font.fontInfo(), w, mc);
                ii->inset->metrics(mi, dim);
-               Dimension const & old_dim = pm.insetDimension(ii->inset);
-               if (old_dim != dim) {
-                       pm.setInsetDimension(ii->inset, dim);
+               if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
+                       insetCache.add(ii->inset, dim);
                        changed = true;
                }
        }
@@ -620,6 +621,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
            && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
                body_pos = 0;
        ParagraphMetrics & pm = par_metrics_[pit];
+       CoordCache::Insets & insetCache = bv_->coordCache().insets();
        Row::iterator cit = row.begin();
        Row::iterator const cend = row.end();
        for ( ; cit != cend; ++cit) {
@@ -634,8 +636,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
                else
                        cit->dim.wid = 5;
                // Cache the inset dimension.
-               bv_->coordCache().insets().add(cit->inset, cit->dim);
-               pm.setInsetDimension(cit->inset, cit->dim);
+               insetCache.add(cit->inset, cit->dim);
        }
 }
 
@@ -777,7 +778,6 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                return;
        }
 
-       ParagraphMetrics const & pm = par_metrics_[pit];
        ParagraphList const & pars = text_->paragraphs();
 
 #if 0
@@ -803,7 +803,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                // The most special cases are handled first.
                if (par.isInset(i)) {
                        Inset const * ins = par.getInset(i);
-                       Dimension dim = pm.insetDimension(ins);
+                       Dimension dim = bv_->coordCache().insets().dim(ins);
                        row.add(i, ins, dim, *fi, par.lookupChange(i));
                } else if (c == ' ' && i + 1 == body_pos) {
                        // There is a space at i, but it should not be
@@ -819,8 +819,17 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                } else if (c == '\t')
                        row.addSpace(i, theFontMetrics(*fi).width(from_ascii("    ")),
                                     *fi, par.lookupChange(i));
-               else
+               else {
+                       // FIXME: please someone fix the Hebrew/Arabic parenthesis mess!
+                       // see also Paragraph::getUChar.
+                       if (fi->language()->lang() == "hebrew") {
+                               if (c == '(')
+                                       c = ')';
+                               else if (c == ')')
+                                       c = '(';
+                       }
                        row.add(i, c, *fi, par.lookupChange(i));
+               }
 
                // add inline completion width
                // draw logically behind the previous character
@@ -919,12 +928,12 @@ void TextMetrics::setRowHeight(Row & row, pit_type const pit,
        int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
 
        // insets may be taller
-       ParagraphMetrics const & pm = par_metrics_[pit];
+       CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
        Row::const_iterator cit = row.begin();
        Row::const_iterator cend = row.end();
        for ( ; cit != cend; ++cit) {
                if (cit->inset) {
-                       Dimension const & dim = pm.insetDimension(cit->inset);
+                       Dimension const & dim = insetCache.dim(cit->inset);
                        maxasc  = max(maxasc,  dim.ascent());
                        maxdesc = max(maxdesc, dim.descent());
                }
@@ -1313,11 +1322,28 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
        cur.setTargetX(x);
 
        // Try to descend recursively inside the inset.
-       inset = inset->editXY(cur, x, yy);
+       Inset * edited = inset->editXY(cur, x, yy);
+       if (edited == inset && 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();
+               }
+       }
 
        if (cur.top().text() == text_)
                cur.setCurrentFont();
-       return inset;
+       return edited;
 }
 
 
@@ -1362,7 +1388,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 {
        Paragraph const & par = text_->paragraphs()[pit];
-       ParagraphMetrics const & pm = par_metrics_[pit];
+       CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
 
        LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
 
@@ -1373,13 +1399,13 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 
                LYXERR(Debug::DEBUG, "examining inset " << inset);
 
-               if (!bv_->coordCache().getInsets().has(inset)) {
+               if (!insetCache.has(inset)) {
                        LYXERR(Debug::DEBUG, "inset has no cached position");
                        return 0;
                }
 
-               Dimension const & dim = pm.insetDimension(inset);
-               Point p = bv_->coordCache().getInsets().xy(inset);
+               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);
@@ -1930,8 +1956,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
                        rp.paintLast();
                if (i == 0 && is_rtl)
                        rp.paintFirst();
-               rp.paintTooLargeMarks(row_x < 0,
-                                     row_x + row.width() > bv_->workWidth());
+               rp.paintTooLargeMarks(row_x + row.left_x() < 0,
+                                     row_x + row.right_x() > bv_->workWidth());
                y += row.descent();
 
                // Restore full_repaint status.