X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.cpp;h=3f132de962d585d3c1366832038f27a22a5988cc;hb=4734433a3ccc287a63fe48726e354e78bc481a81;hp=cf47bcf855d1b5b4b311813d784c45b2e28b0aa4;hpb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;p=lyx.git

diff --git a/src/bufferview_funcs.cpp b/src/bufferview_funcs.cpp
index cf47bcf855..3f132de962 100644
--- a/src/bufferview_funcs.cpp
+++ b/src/bufferview_funcs.cpp
@@ -16,7 +16,6 @@
 
 #include "bufferview_funcs.h"
 
-#include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -26,10 +25,6 @@
 #include "Language.h"
 #include "Color.h"
 #include "Lexer.h"
-#include "Row.h"
-#include "Paragraph.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
 
 #include "frontends/alert.h"
 
@@ -40,11 +35,6 @@
 
 #include <sstream>
 
-
-namespace lyx {
-
-using support::bformat;
-
 using std::istringstream;
 using std::ostringstream;
 using std::string;
@@ -52,6 +42,10 @@ using std::vector;
 using std::find;
 
 
+namespace lyx {
+
+using support::bformat;
+
 namespace bv_funcs {
 
 // Set data using font and toggle
@@ -161,25 +155,51 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 {
 	int x = 0;
 	int y = 0;
+	int lastw = 0;
 
-	// Contribution of nested insets
-	for (size_t i = 1; i != dit.depth(); ++i) {
+	// Addup ontribution of nested insets, from inside to outside,
+	// keeping the outer paragraph for a special handling below
+	for (size_t i = dit.depth() - 1; i >= 1; --i) {
 		CursorSlice const & sl = dit[i];
 		int xx = 0;
 		int yy = 0;
+		
+		// get relative position inside sl.inset()
 		sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
+		
+		// Make relative position inside of the edited inset relative to sl.inset()
 		x += xx;
 		y += yy;
+		
+		// In case of an RTL inset, the edited inset will be positioned to the left
+		// of xx:yy
+		if (sl.text()) {
+			bool boundary_i = boundary && i + 1 == dit.depth();
+			bool rtl = bv.textMetrics(sl.text()).isRTL(sl, boundary_i);
+			if (rtl)
+				x -= lastw;
+			// remember width for the case that sl.inset() is positioned in an RTL inset
+			Dimension const & dim = bv.parMetrics(sl.text(), sl.pit()).
+				insetDimension(&sl.inset());
+			lastw = dim.wid;
+		} else {
+			// remember width for the case that sl.inset() is positioned in an RTL inset
+			Dimension const dim = sl.inset().dimension(bv);
+			lastw = dim.wid;
+		}
+		
 		//lyxerr << "Cursor::getPos, i: "
 		// << i << " x: " << xx << " y: " << y << endl;
 	}
 
 	// Add contribution of initial rows of outermost paragraph
 	CursorSlice const & sl = dit[0];
-	ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit());
+	TextMetrics const & tm = bv.textMetrics(sl.text());
+	ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
 	BOOST_ASSERT(!pm.rows().empty());
 	y -= pm.rows()[0].ascent();
 #if 1
+	// FIXME: document this mess
 	size_t rend;
 	if (sl.pos() > 0 && dit.depth() == 1) {
 		int pos = sl.pos();
@@ -195,8 +215,20 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 	for (size_t rit = 0; rit != rend; ++rit)
 		y += pm.rows()[rit].height();
 	y += pm.rows()[rend].ascent();
-	x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
-
+	
+	TextMetrics const & bottom_tm = bv.textMetrics(dit.bottom().text());
+	
+	// Make relative position from the nested inset now bufferview absolute.
+	int xx = bottom_tm.cursorX(dit.bottom(), boundary && dit.depth() == 1);
+	x += xx;
+	
+	// In the RTL case place the nested inset at the left of the cursor in 
+	// the outer paragraph
+	bool boundary_1 = boundary && 1 == dit.depth();
+	bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
+	if (rtl)
+		x -= lastw;
+	
 	return Point(x, y);
 }
 
@@ -204,19 +236,12 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
 	CursorSlice const & bot = dit.bottom();
-	CoordCache::ParPosCache::const_iterator cache_it = 
-		bv.coordCache().getParPos().find(bot.text());
-	if (cache_it == bv.coordCache().getParPos().end())
+	TextMetrics const & tm = bv.textMetrics(bot.text());
+	if (!tm.has(bot.pit()))
 		return Point(-1, -1);
 
-	CoordCache::InnerParPosCache const & cache = cache_it->second;
-	CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
-	if (it == cache.end()) {
-		//lyxerr << "cursor out of view" << std::endl;
-		return Point(-1, -1);
-	}
 	Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
-	p.y_ += it->second.y_;
+	p.y_ += tm.parMetrics(bot.pit()).position();
 	return p;
 }
 
@@ -225,15 +250,15 @@ Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 // FIXME: This does not work within mathed!
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-	CoordCache::InnerParPosCache const & cache =
-		bv->coordCache().getParPos().find(dit.bottom().text())->second;
-
-	if (cache.find(dit.bottom().pit()) != cache.end())
-		return CUR_INSIDE;
-	else if (dit.bottom().pit() < bv->anchor_ref())
+	// FIXME: it's be better to have something like TextMetrics::status().
+	TextMetrics const & tm = bv->textMetrics(dit.bottom().text());
+	int par_pos = tm.parPosition(dit.bottom().pit());
+	if (par_pos < 0)
 		return CUR_ABOVE;
-	else
+	else if (par_pos > bv->workHeight())
 		return CUR_BELOW;
+		
+	return CUR_INSIDE;
 }
 
 namespace {
@@ -249,7 +274,7 @@ bool findNextInset(DocIterator & dit,
 		if (inset
 		    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
 		    && (contents.empty() ||
-			static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
+		    static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
 			dit = tmpdit;
 			return true;
 		}