X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=3dd052059b44e39d86c07b5eaba743f2631ed59e;hb=2a0e4c199c4f18d80ec5a2ab452f3cf18eafc56c;hp=94594ede2c2b2bb2dc46f7cd11090efa7437fb68;hpb=1fca708c7f33f089055d8ca258d8cd6a357cf2a6;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 94594ede2c..3dd052059b 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -482,11 +482,11 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	if (text_->isMainText()) {
 		if (pit == 0) {
 			pm.rows().front().dimension().asc += 20;
-			/* coverity[copy_paste_error]: 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 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;
 		}
 		ParagraphList const & pars = text_->paragraphs();
@@ -1094,7 +1094,7 @@ void TextMetrics::setRowHeight(Row & row) const
 // returns the column near the specified x-coordinate of the row
 // x is set to the real beginning of this column
 pos_type TextMetrics::getPosNearX(Row const & row, int & x,
-				  bool & boundary) const
+                                  bool & boundary, bool const select) const
 {
 	//LYXERR0("getPosNearX(" << x << ") row=" << row);
 	/// For the main Text, it is possible that this pit is not
@@ -1124,7 +1124,7 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
 		for ( ; cit != cend; ++cit) {
 			if (w <= x &&  w + cit->full_width() > x) {
 				int x_offset = int(x - w);
-				pos = cit->x2pos(x_offset);
+				pos = cit->x2pos(x_offset, select);
 				x = int(x_offset + w);
 				break;
 			}
@@ -1361,18 +1361,23 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	if (edited == inset && cur.pos() == it->pos) {
 		// non-editable inset, set cursor after the inset if x is
 		// nearer to that position (bug 9628)
+		// TODO: This should be replaced with an improvement of
+		// Cursor::moveToClosestEdge that handles rtl text. (Which could not
+		// be tested because of #10569.)
 		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 (insetCache.has(inset)) {
+			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();
+			}
 		}
 	}
 
@@ -1382,7 +1387,8 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 }
 
 
-void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
+void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x,
+                                           int const y, bool const select)
 {
 	LASSERT(text_ == cur.text(), return);
 	pit_type const pit = getPitNearY(y);
@@ -1409,7 +1415,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
 	bool bound = false;
 	int xx = x;
-	pos_type const pos = getPosNearX(row, xx, bound);
+	pos_type const pos = getPosNearX(row, xx, bound, select);
 
 	LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
@@ -1427,28 +1433,12 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
 
 	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, "examining inset " << inset);
-
-		if (!insetCache.has(inset)) {
-			LYXERR(Debug::DEBUG, "inset has no cached position");
-			return 0;
-		}
-
-		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);
+	for (auto const & it : par.insetList()) {
+		LYXERR(Debug::DEBUG, "examining inset " << it.inset);
 
-		if (x >= p.x_ && x <= p.x_ + dim.wid
-		    && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) {
-			LYXERR(Debug::DEBUG, "Hit inset: " << inset);
-			return const_cast<InsetList::InsetTable *>(&(*iit));
+		if (insetCache.covers(it.inset, x, y)) {
+			LYXERR(Debug::DEBUG, "Hit inset: " << it.inset);
+			return const_cast<InsetList::InsetTable *>(&it);
 		}
 	}