X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=547f94962c497187c2a68182ff851aa915e92848;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=fe13bf616012c11190fddfa14a6a3af2cb01168c;hpb=41ecabf5197a74719dd125e974b062184208c96b;p=lyx.git

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index fe13bf6160..547f94962c 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -7,6 +7,7 @@
  * \author Jean-Marc Lasgouttes
  * \author John Levon
  * \author Angus Leeming
+ * \author Juergen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -31,7 +32,6 @@
 #include "pariterator.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
 #include "insets/insetcommand.h"
 #include "insets/insettext.h"
@@ -40,12 +40,16 @@
 
 #include <sstream>
 
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::istringstream;
 using std::ostringstream;
 using std::string;
 using std::vector;
+using std::find;
 
 
 namespace bv_funcs {
@@ -152,7 +156,8 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 // the next two should probably go elsewhere
 // this give the position relative to (0, baseline) of outermost
 // paragraph
-Point coordOffset(DocIterator const & dit, bool boundary)
+Point coordOffset(BufferView const & bv, DocIterator const & dit,
+		bool boundary)
 {
 	int x = 0;
 	int y = 0;
@@ -162,7 +167,7 @@ Point coordOffset(DocIterator const & dit, bool boundary)
 		CursorSlice const & sl = dit[i];
 		int xx = 0;
 		int yy = 0;
-		sl.inset().cursorPos(sl, boundary, xx, yy);
+		sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
 		x += xx;
 		y += yy;
 		//lyxerr << "LCursor::getPos, i: "
@@ -171,41 +176,57 @@ Point coordOffset(DocIterator const & dit, bool boundary)
 
 	// Add contribution of initial rows of outermost paragraph
 	CursorSlice const & sl = dit[0];
-	Paragraph const & par = sl.text()->getPar(sl.pit());
-	y -= par.rows()[0].ascent();
-	//size_t rend = par.pos2row(sl.pos() - boundary ? 1 : 0);
-	size_t rend = par.pos2row(sl.pos());
+	ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit());
+	BOOST_ASSERT(!pm.rows().empty());
+	y -= pm.rows()[0].ascent();
+#if 1
+	size_t rend;
+	if (sl.pos() > 0 && dit.depth() == 1) {
+		int pos = sl.pos();
+		if (pos && boundary)
+			--pos;
+//		lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+		rend = pm.pos2row(pos);
+	} else
+		rend = pm.pos2row(sl.pos());
+#else
+	size_t rend = pm.pos2row(sl.pos());
+#endif
 	for (size_t rit = 0; rit != rend; ++rit)
-		y += par.rows()[rit].height();
-	y += par.rows()[rend].ascent();
-	x += dit.bottom().text()->cursorX(dit.bottom(), boundary);
-	// The following correction should not be there at all.
-	// The cursor looks much better with the -1, though.
-	--x;
+		y += pm.rows()[rit].height();
+	y += pm.rows()[rend].ascent();
+	x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+
 	return Point(x, y);
 }
 
 
-Point getPos(DocIterator const & dit, bool boundary)
+Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
 	CursorSlice const & bot = dit.bottom();
-	CoordCache::InnerParPosCache const & cache =
-		theCoords.getParPos().find(bot.text())->second;
+	CoordCache::ParPosCache::const_iterator cache_it = 
+		bv.coordCache().getParPos().find(bot.text());
+	if (cache_it == bv.coordCache().getParPos().end())
+		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(dit, boundary); // offset from outer paragraph
+	Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
 	p.y_ += it->second.y_;
 	return p;
 }
 
 
 // this could be used elsewhere as well?
+// FIXME: This does not work within mathed!
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-	CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second;
+	CoordCache::InnerParPosCache const & cache =
+		bv->coordCache().getParPos().find(dit.bottom().text())->second;
 
 	if (cache.find(dit.bottom().pit()) != cache.end())
 		return CUR_INSIDE;
@@ -247,6 +268,8 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
 	string contents;
 	DocIterator tmpdit = dit;
 	tmpdit.forwardInset();
+	if (!tmpdit)
+		return false;
 
 	if (same_content) {
 		InsetBase const * inset = tmpdit.nextInset();
@@ -265,7 +288,7 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
 		} else
 			return false;
 	}
-	
+
 	dit = tmpdit;
 	return true;
 }
@@ -298,3 +321,6 @@ void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
 
 
 } // namespace bv_funcs
+
+
+} // namespace lyx