X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=9d944516843c2325e5617b4bd389e6857efcfc9a;hb=10be0c43f20a27a1e6af82241ad5ec6b5cad3eca;hp=9da174fa26060c8b8d983034e64256f7635d977d;hpb=443a45342743615977b024ebfbaf1ecf1af7ddc8;p=lyx.git

diff --git a/src/Row.cpp b/src/Row.cpp
index 9da174fa26..9d94451684 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -28,6 +28,8 @@
 #include <algorithm>
 #include <ostream>
 
+#include <boost/next_prior.hpp>
+
 using namespace std;
 
 namespace lyx {
@@ -36,74 +38,100 @@ using frontend::FontMetrics;
 
 double Row::Element::pos2x(pos_type const i) const
 {
+	// This can happen with inline completion when clicking on the
+	// row after the completion.
+	if (i < pos || i > endpos)
+		return 0;
+
 	bool const rtl = font.isVisibleRightToLeft();
 
-	// handle first the two bounds of the element
-	if ((!rtl && pos >= i) || (rtl && endpos <= i))
-		return 0;
-	if ((!rtl && endpos <= i) || (rtl && pos >= i))
-		return width();
+	double w = 0;
+	//handle first the two bounds of the element
+	if (i == endpos && !(inset && inset->lyxCode() == SEPARATOR_CODE))
+		w = rtl ? 0 : full_width();
+	else if (i == pos || type != STRING)
+		w = rtl ? full_width() : 0;
+	else {
+		FontMetrics const & fm = theFontMetrics(font);
+		w = fm.pos2x(str, i - pos, font.isVisibleRightToLeft());
+	}
 
-	FontMetrics const & fm = theFontMetrics(font);
-	// FIXME Avoid caching of metrics there?
-	int const w = fm.width(str.substr(0, i - pos));
-	if (rtl)
-		return width() - w;
-	else
-		return w;
+	return w;
 }
 
 
-pos_type Row::Element::x2pos(double &x, bool const low) const
+pos_type Row::Element::x2pos(int &x) const
 {
 	//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
-	// if element is rtl, flip x value
 	bool const rtl = font.isVisibleRightToLeft();
-	double x2 = rtl ? (width() - x) : x;
+	size_t i = 0;
 
-	FontMetrics const & fm = theFontMetrics(font);
-	double last_w = 0;
-	double w = 0;
-	size_t i = 1;
-	// non-STRING element only contain one position
-	if (type != STRING) {
+	switch (type) {
+	case STRING: {
+		FontMetrics const & fm = theFontMetrics(font);
+		i = fm.x2pos(str, x, rtl);
+		break;
+	}
+	case VIRTUAL:
+		// those elements are actually empty (but they have a width)
 		i = 0;
-		w = width();
-	} else {
-		// FIXME: implement dichotomy search?
-		for ( ; i <= str.size() ; ++i) {
-			last_w = w;
-			w = fm.width(str.substr(0,i));
-			if (w > x2) {
-				--i;
-				break;
-			}
+		x = rtl ? int(full_width()) : 0;
+		break;
+	case SEPARATOR:
+	case INSET:
+	case SPACE:
+		// those elements contain only one position. Round to
+		// the closest side.
+		if (x > full_width()) {
+			x = int(full_width());
+			i = !rtl;
+		} else {
+			x = 0;
+			i = rtl;
 		}
-		// if (i == str.size())
-		// 	lyxerr << " NOT FOUND ";
-	}
 
-	// round to the closest side
-	if (!low && (x2 - last_w > w - x2)) {
-		x2 = w;
-		++i;
-	} else
-		x2 = last_w;
-
-	// is element is rtl, flip values
-	if (rtl) {
-		x = width() - x2;
-	} else {
-		x = x2;
 	}
-
-	//lyxerr << "=> p=" << i << " x=" << x << endl;
+	//lyxerr << "=> p=" << pos + i << " x=" << x << endl;
 	return pos + i;
+
+}
+
+
+bool Row::Element::breakAt(int w)
+{
+	if (type != STRING || dim.wid <= w)
+		return false;
+
+	bool const rtl = font.isVisibleRightToLeft();
+	if (rtl)
+		w = dim.wid - w;
+	pos_type new_pos = x2pos(w);
+	if (new_pos == pos)
+		return false;
+	str = str.substr(0, new_pos - pos);
+	if (rtl)
+		dim.wid -= w;
+	else
+		dim.wid = w;
+	endpos = new_pos;
+	return true;
+}
+
+
+pos_type Row::Element::left_pos() const
+{
+	return font.isVisibleRightToLeft() ? endpos : pos;
+}
+
+
+pos_type Row::Element::right_pos() const
+{
+	return font.isVisibleRightToLeft() ? pos : endpos;
 }
 
 
 Row::Row()
-	: separator(0), label_hfill(0), x(0), right_margin(0),
+	: separator(0), label_hfill(0), left_margin(0), right_margin(0),
 	  sel_beg(-1), sel_end(-1),
 	  begin_margin_sel(false), end_margin_sel(false),
 	  changed_(false), crc_(0), pos_(0), end_(0), right_boundary_(false)
@@ -190,21 +218,22 @@ ostream & operator<<(ostream & os, Row::Element const & e)
 
 	switch (e.type) {
 	case Row::STRING:
-		os << "STRING: `" << to_utf8(e.str) << "' " << e.dim.wid;
+		os << "STRING: `" << to_utf8(e.str) << "', ";
 		break;
 	case Row::VIRTUAL:
-		os << "VIRTUAL: `" << to_utf8(e.str) << "'";
+		os << "VIRTUAL: `" << to_utf8(e.str) << "', ";
 		break;
 	case Row::INSET:
-		os << "INSET: " << to_utf8(e.inset->layoutName());
+		os << "INSET: " << to_utf8(e.inset->layoutName()) << ", ";
 		break;
 	case Row::SEPARATOR:
-		os << "SEPARATOR: " << e.dim.wid << "+" << e.extra;
+		os << "SEPARATOR: extra=" << e.extra << ", ";
 		break;
 	case Row::SPACE:
-		os << "SPACE: " << e.dim.wid;
+		os << "SPACE: ";
 		break;
 	}
+	os << "width=" << e.full_width();
 	return os;
 }
 
@@ -212,17 +241,19 @@ ostream & operator<<(ostream & os, Row::Element const & e)
 ostream & operator<<(ostream & os, Row const & row)
 {
 	os << " pos: " << row.pos_ << " end: " << row.end_
-	   << " x: " << row.x
+	   << " left_margin: " << row.left_margin
 	   << " width: " << row.dim_.wid
+	   << " right_margin: " << row.right_margin
 	   << " ascent: " << row.dim_.asc
 	   << " descent: " << row.dim_.des
 	   << " separator: " << row.separator
-	   << " label_hfill : " << row.label_hfill << "\n";
-	double x = row.x;
+	   << " label_hfill: " << row.label_hfill 
+	   << " row_boundary: " << row.right_boundary() << "\n";
+	double x = row.left_margin;
 	Row::Elements::const_iterator it = row.elements_.begin();
 	for ( ; it != row.elements_.end() ; ++it) {
 		os << "x=" << x << " => " << *it << endl;
-		x += it->width();
+		x += it->full_width();
 	}
 	return os;
 }
@@ -274,7 +305,6 @@ void Row::add(pos_type const pos, char_type const c,
 		Element e(STRING, pos, f, ch);
 		elements_.push_back(e);
 	}
-	//lyxerr << "FONT " <<back().font.language() << endl;
 	back().str += c;
 	back().endpos = pos + 1;
 }
@@ -286,7 +316,8 @@ void Row::addVirtual(pos_type const pos, docstring const & s,
 	finalizeLast();
 	Element e(VIRTUAL, pos, f, ch);
 	e.str = s;
-	// A completion has no size
+	e.dim.wid = theFontMetrics(f).width(s);
+	dim_.wid += e.dim.wid;
 	e.endpos = pos;
 	elements_.push_back(e);
 	finalizeLast();
@@ -323,62 +354,70 @@ void Row::pop_back()
 }
 
 
-void Row::shorten_if_needed(pos_type const keep, int const w)
+void Row::shortenIfNeeded(pos_type const keep, int const w)
 {
-	if (empty() || width() < w)
+	if (empty() || width() <= w)
 		return;
 
-	/** First, we try to remove elements one by one from the end
-	 * until a separator is found.
-	 */
-	int i = elements_.size();
-	int new_end = end_;
-	int new_wid = dim_.wid;
-	if (i > 0 && elements_[i - 1].type == SEPARATOR && new_end > keep) {
-		--i;
-		new_end = elements_[i].pos;
-		new_wid -= elements_[i].dim.wid;
+	Elements::iterator const beg = elements_.begin();
+	Elements::iterator const end = elements_.end();
+	Elements::iterator last_sep = elements_.end();
+	int last_width = 0;
+	int wid = left_margin;
+
+	Elements::iterator cit = beg;
+	for ( ; cit != end ; ++cit) {
+		if (cit->type == SEPARATOR && cit->pos >= keep) {
+			last_sep = cit;
+			last_width = wid;
+		}
+		if (wid + cit->dim.wid > w)
+			break;
+		wid += cit->dim.wid;
 	}
 
-	while (i > 0 && elements_[i - 1].type != SEPARATOR && new_end > keep) {
-		--i;
-		new_end = elements_[i].pos;
-		new_wid -= elements_[i].dim.wid;
+	if (last_sep != end) {
+		// We have found a suitable separator. This is the
+		// common case.
+		end_ = last_sep->endpos;
+		dim_.wid = last_width;
+		elements_.erase(last_sep, end);
+		return;
 	}
-	if (i == 0) {
-		/* If we are here, it means that we have not found a
-		 * separator to shorten the row. There is one case
-		 * where we can do something: when we have one big
-		 * string, maybe with a paragraph marker after it.
-		 */
-		Element & front = elements_.front();
-		if (!(front.type == STRING
-		      && (elements_.size() == 1
-			  || (elements_.size() == 2
-			      && back().type == VIRTUAL))))
-			return;
-
-		// If this is a string element, we can try to split it.
-		if (front.type != STRING)
-			return;
-		double xstr = w - x;
-		// If there is a paragraph marker, it should be taken in account
-		if (elements_.size() == 2)
-			xstr -= back().width();
-		pos_type new_pos = front.x2pos(xstr, true);
-		front.str = front.str.substr(0, new_pos - pos_);
-		front.dim.wid = xstr;
-		front.endpos = new_pos;
-		end_ = new_pos;
-		dim_.wid = x + xstr;
-		// If there is a paragraph marker, it should be removed.
-		if (elements_.size() == 2)
-			elements_.pop_back();
+
+	if (cit == end) {
+		// This should not happen since the row is too long.
+		LYXERR0("Something is wrong cannot shorten row: " << *this);
 		return;
 	}
-	end_ = new_end;
-	dim_.wid = new_wid;
-	elements_.erase(elements_.begin() + i, elements_.end());
+
+	if (cit != beg && cit->type == VIRTUAL) {
+		// It is not possible to separate a virtual element from the
+		// previous one.
+		--cit;
+		wid -= cit->dim.wid;
+	}
+
+	if (cit != beg) {
+		// There is no separator, but several elements (probably
+		// insets) have been added. We can cut at this place.
+		end_ = cit->pos;
+		dim_.wid = wid;
+		elements_.erase(cit, end);
+		return;
+	}
+
+	/* If we are here, it means that we have not found a separator
+	 * to shorten the row. There is one case where we can do
+	 * something: when we have one big string, maybe with some
+	 * other things after it.
+	 */
+	if (cit->breakAt(w - left_margin)) {
+		end_ = cit->endpos;
+		dim_.wid = left_margin + cit->dim.wid;
+		// If there are other elements, they should be removed.
+		elements_.erase(boost::next(cit), end);
+	}
 }