X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=5617fb76ef3d15334624daa2c4160a13def56011;hb=2f271f61bcd514da3ab5b44d2b7bf61e12ac0c44;hp=f4e62014358740360967da486a3db4f32109848f;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git

diff --git a/src/Row.cpp b/src/Row.cpp
index f4e6201435..5617fb76ef 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -17,6 +17,9 @@
 #include <config.h>
 
 #include "Row.h"
+
+#include "DocIterator.h"
+
 #include "support/debug.h"
 
 
@@ -24,14 +27,16 @@ namespace lyx {
 
 
 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)
+	: separator(0), label_hfill(0), x(0),
+	sel_beg(-1), sel_end(-1), changed_(false), crc_(0), 
+	pos_(0), end_(0), left_margin_sel(false), right_margin_sel(false)
 {}
 
 
 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)
+	: separator(0), label_hfill(0), x(0),
+	sel_beg(-1), sel_end(-1), changed_(false), crc_(0), 
+	pos_(0), end_(0), left_margin_sel(false), right_margin_sel(false)
 {}
 
 
@@ -60,7 +65,47 @@ 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()) {
+		right_margin_sel = isMarginSelected(false, beg, end);
+		left_margin_sel = isMarginSelected(true, beg, end);
+	}
+}
+
+
+void Row::setSelection(pos_type beg, pos_type end) const
 {
 	if (pos_ >= beg && pos_ <= end)
 		sel_beg = pos_;
@@ -78,6 +123,12 @@ void Row::setSelection(pos_type beg, pos_type end)
 }
 
 
+bool Row::selection() const
+{
+	return sel_beg != -1 && sel_end != -1;
+}
+
+
 void Row::dump(char const * s) const
 {
 	LYXERR0(s << " pos: " << pos_ << " end: " << end_