X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=41f94771b80c9072ec752e69865799a1b6276b64;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=08c6b0e77dc3220ce1e7b1ea05212e0585df0b5f;hpb=462eca7d1a1c15d520b89288f8bd83201092a88d;p=lyx.git

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 08c6b0e77d..41f94771b8 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.
  */
@@ -15,44 +16,44 @@
 
 #include "bufferview_funcs.h"
 
+#include "author.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "cursor.h"
+#include "coordcache.h"
 #include "gettext.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrow.h"
 #include "paragraph.h"
 #include "ParagraphParameters.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 namespace lyx::support;
+using lyx::support::bformat;
 
 using std::istringstream;
 using std::ostringstream;
+using std::string;
+using std::vector;
 
 
-namespace {
-
-LyXFont freefont(LyXFont::ALL_IGNORE);
-bool toggleall(false);
-
-}
-
 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())
@@ -69,8 +70,8 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
 	   << "number " << font.number() << '\n'
 	   << "color " << font.color() << '\n'
 	   << "language " << lang << '\n'
-	   << "toggleall " << tostr(toggle);
-	data = STRCONV(os.str());
+	   << "toggleall " << convert<string>(toggle);
+	data = os.str();
 	return true;
 }
 
@@ -79,7 +80,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
 // If successful, returns true
 bool string2font(string const & data, LyXFont & font, bool & toggle)
 {
-	istringstream is(STRCONV(data));
+	istringstream is(data);
 	LyXLex lex(0,0);
 	lex.setStream(is);
 
@@ -149,267 +150,167 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 }
 
 
-string const freefont2string()
-{
-	string data;
-	if (font2string(freefont, toggleall, data))
-		return data;
-	return string();
-}
-
-
-void update_and_apply_freefont(BufferView * bv, string const & data)
+// 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)
 {
-	LyXFont font;
-	bool toggle;
-	if (string2font(data, font, toggle)) {
-		freefont = font;
-		toggleall = toggle;
-		apply_freefont(bv);
+	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;
+		//FIXME: the check for asMathInset() shouldn't be necessary
+		// but math insets do not return a sensible editable() state yet.
+		if (sl.inset().asMathInset() 
+		    || sl.inset().editable() == InsetBase::HIGHLY_EDITABLE)
+			sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
+		x += xx;
+		y += yy;
+		//lyxerr << "LCursor::getPos, i: "
+		// << i << " x: " << xx << " y: " << y << endl;
 	}
-}
-
-
-void apply_freefont(BufferView * bv)
-{
-	toggleAndShow(bv, freefont, toggleall);
-	bv->owner()->view_state_changed();
-	bv->owner()->message(_("Character set"));
-}
-
-
-void emph(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setEmph(LyXFont::TOGGLE);
-	toggleAndShow(bv, font);
-}
-
 
-void bold(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setSeries(LyXFont::BOLD_SERIES);
-	toggleAndShow(bv, font);
-}
-
-
-void noun(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setNoun(LyXFont::TOGGLE);
-	toggleAndShow(bv, font);
-}
-
-
-void number(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setNumber(LyXFont::TOGGLE);
-	toggleAndShow(bv, font);
-}
-
-
-void lang(BufferView * bv, string const & l)
-{
-	Language const * lang = languages.getLanguage(l);
-	if (!lang)
-		return;
-
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setLanguage(lang);
-	toggleAndShow(bv, font);
-}
-
-
-bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_only)
-{
-	if (!bv->available() || !text)
-		return false;
-
-	if (test_only)
-		return text->changeDepth(type, true);
-
-	bool const changed = text->changeDepth(type, false);
-	if (text->inset_owner)
-		bv->updateInset(text->inset_owner);
-	return changed;
-}
-
-
-void code(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
-	toggleAndShow(bv, font);
+	// 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();
+#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 = par.pos2row(pos);
+	} else
+		rend = par.pos2row(sl.pos());
+#else
+	size_t rend = par.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 && dit.depth() == 1);
+	// The following correction should not be there at all.
+	// The cursor looks much better with the -1, though.
+	--x;
+	return Point(x, y);
 }
 
 
-void sans(BufferView * bv)
+Point getPos(DocIterator const & dit, bool boundary)
 {
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setFamily(LyXFont::SANS_FAMILY);
-	toggleAndShow(bv, font);
+	CursorSlice const & bot = dit.bottom();
+	CoordCache::InnerParPosCache const & cache =
+		theCoords.getParPos().find(bot.text())->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
+	p.y_ += it->second.y_;
+	return p;
 }
 
 
-void roman(BufferView * bv)
+// this could be used elsewhere as well?
+CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setFamily(LyXFont::ROMAN_FAMILY);
-	toggleAndShow(bv, font);
+	CoordCache::InnerParPosCache const & cache = theCoords.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())
+		return CUR_ABOVE;
+	else
+		return CUR_BELOW;
 }
 
+namespace {
 
-void styleReset(BufferView * bv)
+bool findNextInset(DocIterator & dit,
+		   vector<InsetBase_code> const & codes,
+		   string const & contents)
 {
-	LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
-	toggleAndShow(bv, font);
-}
-
+	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();
+	}
 
-void underline(BufferView * bv)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setUnderbar(LyXFont::TOGGLE);
-	toggleAndShow(bv, font);
+	return false;
 }
 
-
-void fontSize(BufferView * bv, string const & size)
-{
-	LyXFont font(LyXFont::ALL_IGNORE);
-	font.setLyXSize(size);
-	toggleAndShow(bv, font);
-}
+} // namespace anon
 
 
-// Returns the current font and depth as a message.
-string const currentState(BufferView * bv)
+bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
+	       bool same_content)
 {
-	if (!bv->available())
-		return string();
-
-	if (mathcursor)
-		return mathcursor->info();
-
-	ostringstream state;
-
-	LyXText * text = bv->getLyXText();
-	Buffer * buffer = bv->buffer();
-	LyXCursor const & c(text->cursor);
-
-	bool const show_change = buffer->params.tracking_changes
-		&& c.pos() != c.par()->size()
-		&& c.par()->lookupChange(c.pos()) != Change::UNCHANGED;
-
-	if (show_change) {
-		Change change(c.par()->lookupChangeFull(c.pos()));
-		Author const & a(bv->buffer()->authors().get(change.author));
-		state << _("Change: ") << a.name();
-		if (!a.email().empty()) {
-			state << " (" << a.email() << ")";
+	string contents;
+	DocIterator tmpdit = dit;
+	tmpdit.forwardInset();
+
+	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();
 		}
-		if (change.changetime)
-			state << _(" at ") << ctime(&change.changetime);
-		state << " : ";
 	}
 
-	// I think we should only show changes from the default
-	// font. (Asger)
-	LyXFont font = text->real_current_font;
-	LyXFont const & defaultfont =
-		buffer->params.getLyXTextClass().defaultfont();
-	font.reduce(defaultfont);
-
-	// avoid _(...) re-entrance problem
-	string const s = font.stateText(&buffer->params);
-	state << bformat(_("Font: %1$s"), s);
-
-	// state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
-
-	// The paragraph depth
-	int depth = text->getDepth();
-	if (depth > 0)
-		state << bformat(_(", Depth: %1$s"), tostr(depth));
-
-	// The paragraph spacing, but only if different from
-	// buffer spacing.
-	if (!text->cursor.par()->params().spacing().isDefault()) {
-		Spacing::Space cur_space =
-			text->cursor.par()->params().spacing().getSpace();
-		state << _(", Spacing: ");
-
-		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->cursor.par()->params().spacing().getValue()
-			      << ')';
-			break;
-		case Spacing::Default:
-			// should never happen, do nothing
-			break;
-		}
+	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;
 	}
-#ifdef DEVEL_VERSION
-	state << _(", Paragraph: ") << text->cursor.par()->id();
-	state << _(", Position: ") << text->cursor.pos();
-	RowList::iterator rit = text->cursorRow();
-	state << bformat(_(", Row b:%1$d e:%2$d"), rit->pos(), rit->end());
-	state << _(", Inset: ") <<
-		(text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1);
-#endif
-	return STRCONV(state.str());
+	
+	dit = tmpdit;
+	return true;
 }
 
 
-/* Does the actual toggle job of the calls above.
- * Also shows the current font state.
- */
-void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
+void findInset(DocIterator & dit, InsetBase_code code, bool same_content)
 {
-	if (!bv->available())
-		return;
+	findInset(dit, vector<InsetBase_code>(1, code), same_content);
+}
+
 
-	if (bv->theLockingInset()) {
-		bv->theLockingInset()->setFont(bv, font, toggleall);
+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;
 	}
 
-	LyXText * text = bv->getLyXText();
-	text->toggleFree(font, toggleall);
-	bv->update();
-
-	if (font.language() != ignore_language ||
-	    font.number() != LyXFont::IGNORE) {
-		LyXCursor & cursor = text->cursor;
-		text->computeBidiTables(text->cursor.par(), *bv->buffer(),
-			text->cursorRow());
-		if (cursor.boundary() !=
-		    text->isBoundary(*bv->buffer(), *cursor.par(), cursor.pos(),
-				     text->real_current_font))
-			text->setCursor(cursor.par(), cursor.pos(),
-					false, !cursor.boundary());
-	}
+	tmpcur.clearSelection();
+	bv->setCursor(tmpcur);
 }
 
 
-// deletes a selection during an insertion
-void replaceSelection(LyXText * lt)
+void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
 {
-	if (lt->selection.set()) {
-		lt->cutSelection(true, false);
-		lt->bv()->update();
-	}
+	gotoInset(bv, vector<InsetBase_code>(1, code), same_content);
 }
 
-}; // namespace bv_funcs
+
+} // namespace bv_funcs