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

diff --git a/src/Row.cpp b/src/Row.cpp
index 9e40986695..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,48 +38,110 @@ 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;
 }
 
 
-Row::Row()
-	: separator(0), label_hfill(0), x(0),
-	sel_beg(-1), sel_end(-1),
-	begin_margin_sel(false), end_margin_sel(false),
-	changed_(false), crc_(0), pos_(0), end_(0)
-{}
+pos_type Row::Element::x2pos(int &x) const
+{
+	//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
+	bool const rtl = font.isVisibleRightToLeft();
+	size_t i = 0;
+
+	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;
+		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;
+		}
 
+	}
+	//lyxerr << "=> p=" << pos + i << " x=" << x << endl;
+	return pos + i;
 
-void Row::setCrc(size_type crc) const
+}
+
+
+bool Row::Element::breakAt(int w)
 {
-	changed_ = crc != crc_;
-	crc_ = crc;
+	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;
 }
 
 
-void Row::pos(pos_type p)
+pos_type Row::Element::left_pos() const
 {
-	pos_ = p;
+	return font.isVisibleRightToLeft() ? endpos : pos;
 }
 
 
-void Row::endpos(pos_type p)
+pos_type Row::Element::right_pos() const
+{
+	return font.isVisibleRightToLeft() ? pos : endpos;
+}
+
+
+Row::Row()
+	: 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)
+{}
+
+
+void Row::setCrc(size_type crc) const
 {
-	end_ = p;
+	changed_ = crc != crc_;
+	crc_ = crc;
 }
 
 
@@ -153,22 +217,23 @@ ostream & operator<<(ostream & os, Row::Element const & e)
 		os << e.pos << ">>" << e.endpos << " ";
 
 	switch (e.type) {
-	case Row::Element::STRING:
-		os << "STRING: `" << to_utf8(e.str) << "'";
+	case Row::STRING:
+		os << "STRING: `" << to_utf8(e.str) << "', ";
 		break;
-	case Row::Element::COMPLETION:
-		os << "COMPLETION: `" << to_utf8(e.str) << "'";
+	case Row::VIRTUAL:
+		os << "VIRTUAL: `" << to_utf8(e.str) << "', ";
 		break;
-	case Row::Element::INSET:
-		os << "INSET: " << to_utf8(e.inset->layoutName());
+	case Row::INSET:
+		os << "INSET: " << to_utf8(e.inset->layoutName()) << ", ";
 		break;
-	case Row::Element::SEPARATOR:
-		os << "SEPARATOR: " << e.dim.wid << "+" << e.extra;
+	case Row::SEPARATOR:
+		os << "SEPARATOR: extra=" << e.extra << ", ";
 		break;
-	case Row::Element::SPACE:
-		os << "SPACE: " << e.dim.wid;
+	case Row::SPACE:
+		os << "SPACE: ";
 		break;
 	}
+	os << "width=" << e.full_width();
 	return os;
 }
 
@@ -176,14 +241,19 @@ ostream & operator<<(ostream & os, Row::Element const & e)
 ostream & operator<<(ostream & os, Row const & row)
 {
 	os << " pos: " << row.pos_ << " end: " << row.end_
+	   << " 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";
+	   << " 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 << "** " << *it << endl;
+		os << "x=" << x << " => " << *it << endl;
+		x += it->full_width();
 	}
 	return os;
 }
@@ -194,7 +264,7 @@ bool Row::sameString(Font const & f, Change const & ch) const
 	if (elements_.empty())
 		return false;
 	Element const & elt = elements_.back();
-	return elt.type == Element::STRING && !elt.final
+	return elt.type == STRING && !elt.final
 		   && elt.font == f && elt.change == ch;
 }
 
@@ -208,7 +278,7 @@ void Row::finalizeLast()
 		return;
 	elt.final = true;
 
-	if (elt.type == Element::STRING) {
+	if (elt.type == STRING) {
 		elt.dim.wid = theFontMetrics(elt.font).width(elt.str);
 		dim_.wid += elt.dim.wid;
 	}
@@ -219,7 +289,7 @@ void Row::add(pos_type const pos, Inset const * ins, Dimension const & dim,
 	      Font const & f, Change const & ch)
 {
 	finalizeLast();
-	Element e(Element::INSET, pos, f, ch);
+	Element e(INSET, pos, f, ch);
 	e.inset = ins;
 	e.dim = dim;
 	elements_.push_back(e);
@@ -232,22 +302,22 @@ void Row::add(pos_type const pos, char_type const c,
 {
 	if (!sameString(f, ch)) {
 		finalizeLast();
-		Element e(Element::STRING, pos, f, ch);
+		Element e(STRING, pos, f, ch);
 		elements_.push_back(e);
 	}
-	//lyxerr << "FONT " <<back().font.language() << endl;
 	back().str += c;
 	back().endpos = pos + 1;
 }
 
 
-void Row::addCompletion(pos_type const pos, docstring const & s,
-			Font const & f, Change const & ch)
+void Row::addVirtual(pos_type const pos, docstring const & s,
+		     Font const & f, Change const & ch)
 {
 	finalizeLast();
-	Element e(Element::COMPLETION, pos, f, ch);
+	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();
@@ -258,7 +328,7 @@ void Row::addSeparator(pos_type const pos, char_type const c,
 		       Font const & f, Change const & ch)
 {
 	finalizeLast();
-	Element e(Element::SEPARATOR, pos, f, ch);
+	Element e(SEPARATOR, pos, f, ch);
 	e.str += c;
 	e.dim.wid = theFontMetrics(f).width(c);
 	elements_.push_back(e);
@@ -270,7 +340,7 @@ void Row::addSpace(pos_type const pos, int const width,
 		   Font const & f, Change const & ch)
 {
 	finalizeLast();
-	Element e(Element::SPACE, pos, f, ch);
+	Element e(SPACE, pos, f, ch);
 	e.dim.wid = width;
 	elements_.push_back(e);
 	dim_.wid += e.dim.wid;
@@ -284,50 +354,92 @@ void Row::pop_back()
 }
 
 
-void Row::separate_back(pos_type const keep)
+void Row::shortenIfNeeded(pos_type const keep, int const w)
 {
-	if (empty())
+	if (empty() || width() <= w)
 		return;
-	int i = elements_.size();
-	int new_end = end_;
-	int new_wid = dim_.wid;
-	if (i > 0 && elements_[i - 1].isSeparator() && 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].isSeparator() && 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 (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);
+	}
 }
 
 
-void Row::reverseRtL()
+void Row::reverseRTL(bool const rtl_par)
 {
 	pos_type i = 0;
 	pos_type const end = elements_.size();
 	while (i < end) {
-		// skip LtR elements
-		while (i < end && !elements_[i].font.isRightToLeft())
-			++i;
-		if (i >= end)
-			break;
-
-		// look for a RtL sequence
+		// gather a sequence of elements with the same direction
+		bool const rtl = elements_[i].font.isVisibleRightToLeft();
 		pos_type j = i;
-		while (j < end && elements_[j].font.isRightToLeft())
+		while (j < end && elements_[j].font.isVisibleRightToLeft() == rtl)
 			++j;
-		reverse(elements_.begin() + i, elements_.begin() + j);
+		// if the direction is not the same as the paragraph
+		// direction, the sequence has to be reverted.
+		if (rtl != rtl_par)
+			reverse(elements_.begin() + i, elements_.begin() + j);
 		i = j;
 	}
+	// If the paragraph itself is RTL, reverse everything
+	if (rtl_par)
+		reverse(elements_.begin(), elements_.end());
 }
 
 } // namespace lyx