X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=66b1726d89bd04e09af044f9977cd945e755803e;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=c965210e7a1c258494a2f8af0a2c3e20bd65d2d7;hpb=26f336769af8dd5c48c2c0241cd3fbfc50a3c65e;p=lyx.git

diff --git a/src/Row.cpp b/src/Row.cpp
index c965210e7a..66b1726d89 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -4,10 +4,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -17,34 +17,32 @@
 #include <config.h>
 
 #include "Row.h"
-#include "debug.h"
 
+#include "DocIterator.h"
 
-namespace lyx {
+#include "support/debug.h"
 
 
-Row::Row()
-	: separator(0), hfill(0), label_hfill(0), x(0),
-	sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0)
-{}
+namespace lyx {
 
 
-Row::Row(pos_type pos)
-	: separator(0), hfill(0), label_hfill(0), x(0),
-	sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
+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)
 {}
 
 
-void Row::setCrc(size_type crc)
+void Row::setCrc(size_type crc) const
 {
-	changed_ |= crc != crc_;
+	changed_ = crc != crc_;
 	crc_ = crc;
 }
 
 
 void Row::setDimension(Dimension const & dim)
 {
-	changed_ |= dim != dim_;
 	dim_ = dim;
 }
 
@@ -61,9 +59,48 @@ void Row::endpos(pos_type p)
 }
 
 
-void Row::setSelection(pos_type beg, pos_type end)
+bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
+		DocIterator const & end) const
+{
+	pos_type const sel_pos = left_margin ? sel_beg : sel_end;
+	pos_type const margin_pos = left_margin ? pos_ : end_;
+
+	// Is the chosen margin selected ?
+	if (sel_pos == margin_pos) {
+		if (beg.pos() == end.pos())
+			// This is a special case in which the space between after 
+			// pos i-1 and before pos i is selected, i.e. the margins
+			// (see DocIterator::boundary_).
+			return beg.boundary() && !end.boundary();
+		else if (end.pos() == margin_pos)
+			// If the selection ends around the margin, it is only
+			// drawn if the cursor is after the margin.
+			return !end.boundary();
+		else if (beg.pos() == margin_pos)
+			// If the selection begins around the margin, it is 
+			// only drawn if the cursor is before the margin.
+			return beg.boundary();
+		else 
+			return true;
+	}
+	return false;
+}
+
+
+void Row::setSelectionAndMargins(DocIterator const & beg, 
+		DocIterator const & end) const
+{
+	setSelection(beg.pos(), end.pos());
+	
+	if (selection()) {
+		end_margin_sel = isMarginSelected(false, beg, end);
+		begin_margin_sel = isMarginSelected(true, beg, end);
+	}
+}
+
+
+void Row::setSelection(pos_type beg, pos_type end) const
 {
-	pos_type sel_beg_b = sel_beg;
 	if (pos_ >= beg && pos_ <= end)
 		sel_beg = pos_;
 	else if (beg > pos_ && beg <= end_)
@@ -71,31 +108,27 @@ void Row::setSelection(pos_type beg, pos_type end)
 	else
 		sel_beg = -1;
 
-	pos_type sel_end_b = sel_end;
 	if (end_ >= beg && end_ <= end)
 		sel_end = end_;
 	else if (end < end_ && end >= pos_)
 		sel_end = end;
 	else
 		sel_end = -1;
-/*
-			&& ((rit->pos() >= beg.pos() && rit->pos() <= end.pos())
-				|| (rit->endpos() >= beg.pos() && rit->endpos() <= end.pos())
-				|| (beg.pos() >= rit->pos() && beg.pos() <= rit->endpos())
-				|| (end.pos() >= rit->pos() && end.pos() <= rit->endpos()));
-*/
-	changed_ |= sel_beg_b != sel_beg;
-	changed_ |= sel_end_b != sel_end;
+}
+
+
+bool Row::selection() const
+{
+	return sel_beg != -1 && sel_end != -1;
 }
 
 
 void Row::dump(char const * s) const
 {
-	lyxerr << s << " pos: " << pos_ << " end: " << end_
+	LYXERR0(s << " pos: " << pos_ << " end: " << end_
 		<< " width: " << dim_.wid
 		<< " ascent: " << dim_.asc
-		<< " descent: " << dim_.des
-		<< std::endl;
+		<< " descent: " << dim_.des);
 }