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

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 02eff20234..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.
  */
@@ -20,6 +21,7 @@
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "cursor.h"
+#include "coordcache.h"
 #include "gettext.h"
 #include "language.h"
 #include "LColor.h"
@@ -27,31 +29,34 @@
 #include "lyxrow.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "iterators.h"
+#include "pariterator.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
+#include "insets/insetcommand.h"
 #include "insets/insettext.h"
 
-#include "mathed/math_cursor.h"
+#include "support/convert.h"
 
-#include "support/tostr.h"
+#include <sstream>
 
-#include "support/std_sstream.h"
 
-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 {
 
 // Set data using font and toggle
 // If successful, returns true
-bool font2string(LyXFont const & font, bool toggle, string & data)
+bool font2string(LyXFont const & font, bool const toggle, string & data)
 {
 	string lang = "ignore";
 	if (font.language())
@@ -68,7 +73,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
 	   << "number " << font.number() << '\n'
 	   << "color " << font.color() << '\n'
 	   << "language " << lang << '\n'
-	   << "toggleall " << tostr(toggle);
+	   << "toggleall " << convert<string>(toggle);
 	data = os.str();
 	return true;
 }
@@ -148,120 +153,174 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 }
 
 
-bool changeDepthAllowed(BufferView * bv, LyXText * text, DEPTH_CHANGE type)
+// the next two should probably go elsewhere
+// this give the position relative to (0, baseline) of outermost
+// paragraph
+Point coordOffset(BufferView const & bv, DocIterator const & dit,
+		bool boundary)
 {
-	if (!bv->available() || !text)
-		return false;
+	int x = 0;
+	int y = 0;
+
+	// Contribution of nested insets
+	for (size_t i = 1; i != dit.depth(); ++i) {
+		CursorSlice const & sl = dit[i];
+		int xx = 0;
+		int yy = 0;
+		sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
+		x += xx;
+		y += yy;
+		//lyxerr << "LCursor::getPos, i: "
+		// << i << " x: " << xx << " y: " << y << endl;
+	}
 
-	return text->changeDepthAllowed(type);
+	// Add contribution of initial rows of outermost paragraph
+	CursorSlice const & sl = dit[0];
+	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 += 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);
 }
 
 
-void changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type)
+Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
-	if (!bv->available() || !text)
-		return;
-	text->changeDepth(type);
+	CursorSlice const & bot = dit.bottom();
+	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(bv, dit, boundary); // offset from outer paragraph
+	p.y_ += it->second.y_;
+	return p;
 }
 
 
-// Returns the current font and depth as a message.
-string const currentState(BufferView * bv)
+// this could be used elsewhere as well?
+// FIXME: This does not work within mathed!
+CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-	if (!bv->available())
-		return string();
-
-	if (mathcursor)
-		return mathcursor->info();
-
-	ostringstream state;
-
-	LyXText * text = bv->getLyXText();
-	Buffer * buffer = bv->buffer();
-	CursorSlice const & c = text->cursor();
-
-	bool const show_change = buffer->params().tracking_changes
-		&& text->cursor().pos() != text->cursorPar()->size()
-		&& text->cursorPar()->lookupChange(c.pos()) != Change::UNCHANGED;
-
-	if (show_change) {
-		Change change = text->cursorPar()->lookupChangeFull(c.pos());
-		Author const & a = bv->buffer()->params().authors().get(change.author);
-		state << _("Change: ") << a.name();
-		if (!a.email().empty())
-			state << " (" << a.email() << ")";
-		if (change.changetime)
-			state << _(" at ") << ctime(&change.changetime);
-		state << " : ";
-	}
+	CoordCache::InnerParPosCache const & cache =
+		bv->coordCache().getParPos().find(dit.bottom().text())->second;
 
-	// I think we should only show changes from the default
-	// font. (Asger)
-	LyXFont font = text->real_current_font;
-	font.reduce(buffer->params().getLyXTextClass().defaultfont());
+	if (cache.find(dit.bottom().pit()) != cache.end())
+		return CUR_INSIDE;
+	else if (dit.bottom().pit() < bv->anchor_ref())
+		return CUR_ABOVE;
+	else
+		return CUR_BELOW;
+}
 
-	// avoid _(...) re-entrance problem
-	string const s = font.stateText(&buffer->params());
-	state << bformat(_("Font: %1$s"), s);
+namespace {
 
-	// state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
+bool findNextInset(DocIterator & dit,
+		   vector<InsetBase_code> const & codes,
+		   string const & contents)
+{
+	DocIterator tmpdit = dit;
+
+	while (tmpdit) {
+		InsetBase const * inset = tmpdit.nextInset();
+		if (inset
+		    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
+		    && (contents.empty() ||
+			static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
+			dit = tmpdit;
+			return true;
+		}
+		tmpdit.forwardInset();
+	}
 
-	// The paragraph depth
-	int depth = text->getDepth();
-	if (depth > 0)
-		state << bformat(_(", Depth: %1$s"), tostr(depth));
+	return false;
+}
 
-	// The paragraph spacing, but only if different from
-	// buffer spacing.
-	if (!text->cursorPar()->params().spacing().isDefault()) {
-		Spacing::Space cur_space =
-			text->cursorPar()->params().spacing().getSpace();
-		state << _(", Spacing: ");
+} // namespace anon
 
-		switch (cur_space) {
-		case Spacing::Single:
-			state << _("Single");
-			break;
-		case Spacing::Onehalf:
-			state << _("OneHalf");
-			break;
-		case Spacing::Double:
-			state << _("Double");
-			break;
-		case Spacing::Other:
-			state << _("Other (")
-			      << text->cursorPar()->params().spacing().getValue()
-			      << ')';
-			break;
-		case Spacing::Default:
-			// should never happen, do nothing
-			break;
+
+bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
+	       bool same_content)
+{
+	string contents;
+	DocIterator tmpdit = dit;
+	tmpdit.forwardInset();
+	if (!tmpdit)
+		return false;
+
+	if (same_content) {
+		InsetBase const * inset = tmpdit.nextInset();
+		if (inset
+		    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+			contents = static_cast<InsetCommand const *>(inset)->getContents();
 		}
 	}
-#ifdef DEVEL_VERSION
-	ParagraphList::iterator pit = text->cursorPar();
-	state << _(", Paragraph: ") << pit->id();
-	state << _(", Position: ") << text->cursor().pos();
-	RowList::iterator rit = pit->getRow(text->cursor().pos());
-	state << bformat(_(", Row b:%1$d e:%2$d"), rit->pos(), rit->endpos());
-	state << _(", Inset: ");
-	InsetOld * inset = pit->inInset();
-	if (inset)
-		state << inset << " owner: " << inset->owner();
-	else
-		state << -1;
-#endif
-	return state.str();
+
+	if (!findNextInset(tmpdit, codes, contents)) {
+		if (dit.depth() != 1 || dit.pit() != 0 || dit.pos() != 0) {
+			tmpdit  = doc_iterator_begin(tmpdit.bottom().inset());
+			if (!findNextInset(tmpdit, codes, contents)) {
+				return false;
+			}
+		} else
+			return false;
+	}
+
+	dit = tmpdit;
+	return true;
 }
 
 
-// deletes a selection during an insertion
-void replaceSelection(LyXText * text)
+void findInset(DocIterator & dit, InsetBase_code code, bool same_content)
 {
-	if (text->bv()->selection().set()) {
-		text->cutSelection(true, false);
-		text->bv()->update();
+	findInset(dit, vector<InsetBase_code>(1, code), same_content);
+}
+
+
+void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
+	       bool same_content)
+{
+	LCursor tmpcur = bv->cursor();
+	if (!findInset(tmpcur, codes, same_content)) {
+		bv->cursor().message(_("No more insets"));
+		return;
 	}
+
+	tmpcur.clearSelection();
+	bv->setCursor(tmpcur);
+}
+
+
+void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
+{
+	gotoInset(bv, vector<InsetBase_code>(1, code), same_content);
 }
 
+
 } // namespace bv_funcs
+
+
+} // namespace lyx