X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=975940310c41b346b90342597a8c907b81190e34;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=61ae559a166cb57e1c9f2200d71567887615bb83;hpb=378c7af432186b6b6a905dbe72690a587757124d;p=lyx.git

diff --git a/src/Row.cpp b/src/Row.cpp
index 61ae559a16..975940310c 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -17,36 +17,41 @@
 #include <config.h>
 
 #include "Row.h"
-#include "debug.h"
 
-
-namespace lyx {
+#include "support/debug.h"
 
 
-RowMetrics::RowMetrics()
-	: separator(0), hfill(0), label_hfill(0), x(0)
-{}
+namespace lyx {
 
 
 Row::Row()
-	: 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)
 {}
 
 
 Row::Row(pos_type pos)
-	: pos_(pos), end_(0)
+	: separator(0), label_hfill(0), x(0),
+	sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
 {}
 
 
-void Row::pos(pos_type p)
+void Row::setCrc(size_type crc) const
 {
-	pos_ = p;
+	changed_ = crc != crc_;
+	crc_ = crc;
 }
 
 
-pos_type Row::pos() const
+void Row::setDimension(Dimension const & dim)
 {
-	return pos_;
+	dim_ = dim;
+}
+
+
+void Row::pos(pos_type p)
+{
+	pos_ = p;
 }
 
 
@@ -56,19 +61,30 @@ void Row::endpos(pos_type p)
 }
 
 
-pos_type Row::endpos() const
+void Row::setSelection(pos_type beg, pos_type end) const
 {
-	return end_;
+	if (pos_ >= beg && pos_ <= end)
+		sel_beg = pos_;
+	else if (beg > pos_ && beg <= end_)
+		sel_beg = beg;
+	else
+		sel_beg = -1;
+
+	if (end_ >= beg && end_ <= end)
+		sel_end = end_;
+	else if (end < end_ && end >= pos_)
+		sel_end = end;
+	else
+		sel_end = -1;
 }
 
 
-void Row::dump(const char * s) const
+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);
 }